diff -r 41511e0127d97a0a2992a15858f25eb9ee10a01c -r f1c1e101e3d4eddb9386a8c9beb62cea82787191 indefero/src/IDF/Form/UserAccount.php
--- a/indefero/src/IDF/Form/UserAccount.php	Sat Aug 10 20:58:59 2013 -0500
+++ b/indefero/src/IDF/Form/UserAccount.php	Sat Aug 10 23:34:51 2013 -0500
@@ -173,7 +173,7 @@
                                             'help_text' => __('You will get an email to confirm that you own the address you specify.'),
                                             ));
         $otp = "";
-        if ($user_data->otpkey != "")
+        if ($this->user->otpkey != "")
             $otp = Pluf_Utils::convBase($this->user->otpkey, '0123456789abcdef', 'abcdefghijklmnopqrstuvwxyz234567');
         $this->fields['otpkey'] = new Pluf_Form_Field_Varchar(
                                         array('required' => false,
diff -r 41511e0127d97a0a2992a15858f25eb9ee10a01c -r f1c1e101e3d4eddb9386a8c9beb62cea82787191 indefero/src/IDF/Plugin/SyncSvn.php
--- a/indefero/src/IDF/Plugin/SyncSvn.php	Sat Aug 10 20:58:59 2013 -0500
+++ b/indefero/src/IDF/Plugin/SyncSvn.php	Sat Aug 10 23:34:51 2013 -0500
@@ -94,7 +94,9 @@
                                         'output' => $output)));
             return;
         }
-        $p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-commit');
+        // FIX ME
+        //$p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-commit');
+        $p = "/home/www/indefero/scripts/svn-post-commit";
         exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').'ln -s %s %s', 
                      escapeshellarg($p), 
                      escapeshellarg($svn_path.'/'.$shortname.'/hooks/post-commit')),
@@ -105,7 +107,8 @@
                                  $svn_path.'/'.$shortname.'/hooks/post-commit'));
             return;
         }
-        $p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-revprop-change');
+        //$p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-revprop-change');
+        $p = "/home/www/indefero/scripts/svn-post-revprop-change";
         exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').'ln -s %s %s', 
                      escapeshellarg($p), 
                      escapeshellarg($svn_path.'/'.$shortname.'/hooks/post-revprop-change')),
diff -r 41511e0127d97a0a2992a15858f25eb9ee10a01c -r f1c1e101e3d4eddb9386a8c9beb62cea82787191 pluf/src/Pluf/User.php
--- a/pluf/src/Pluf/User.php	Sat Aug 10 20:58:59 2013 -0500
+++ b/pluf/src/Pluf/User.php	Sat Aug 10 23:34:51 2013 -0500
@@ -271,7 +271,7 @@
         } else {
             $otp = substr($password, 0, 6);
             $pass = substr($password, 6);
-            $totp = new \OTPHP\TOTP(strtoupper($this->otpkey));
+            $totp = new \OTPHP\TOTP(strtoupper(Pluf_Utils::convBase($this->otpkey, '0123456789abcdef', 'abcdefghijklmnopqrstuvwxyz234567')));
             if ($totp->verify($otp) && $this->password == base64_encode(sha1($pass, TRUE)))
             {
                 return true;