diff --git a/lib/Pi/Markup/Renderer/Text.php b/lib/Pi/Markup/Renderer/Text.php
index 6a5c137f1b..61b668ebf3 100644
--- a/lib/Pi/Markup/Renderer/Text.php
+++ b/lib/Pi/Markup/Renderer/Text.php
@@ -19,6 +19,7 @@
 
 namespace Pi\Markup\Renderer;
 
+use Pi;
 use Pi\Markup\Parser\AbstractParser;
 //use Pi\Security\Security;
 
diff --git a/usr/module/system/src/Controller/Admin/MemberController.php b/usr/module/system/src/Controller/Admin/MemberController.php
index e4c513f520..e29fd509d5 100644
--- a/usr/module/system/src/Controller/Admin/MemberController.php
+++ b/usr/module/system/src/Controller/Admin/MemberController.php
@@ -112,7 +112,7 @@ public function indexAction()
         */
         foreach ($users as $id => &$user) {
             $user['role'] = $roleList[$user['role']];
-            $user['role_staff'] = $roleList[$user['role_staff']];
+            $user['role_staff'] = isset($user['role_staff']) ? $roleList[$user['role_staff']] : '';
         }
 
         $paginator = Paginator::factory(intval($count));
@@ -136,7 +136,7 @@ public function indexAction()
         $title = __('Member list');
         $this->view()->assign('title', $title);
         $this->view()->assign('users', $users);
-        $this->view()->assign('role', $role);
+        //$this->view()->assign('role', $role);
         $this->view()->assign('roles', $roles);
     }
 
@@ -148,7 +148,7 @@ public function roleAction()
             return;
         }
 
-        $active = $this->params('active', null);
+        //$active = $this->params('active', null);
         $page = $this->params('p', 1);
         $limit = 50;
         $offset = (int) ($page - 1) * $limit;
@@ -211,7 +211,7 @@ public function roleAction()
 
             foreach ($users as $id => &$user) {
                 $user['role'] = $roleList[$user['role']];
-                $user['role_staff'] = $roleList[$user['role_staff']];
+                $user['role_staff'] = isset($user['role_staff']) ? $roleList[$user['role_staff']] : '';
             }
         }
 
diff --git a/usr/module/system/src/Controller/Front/LoginController.php b/usr/module/system/src/Controller/Front/LoginController.php
index 161cee7353..f01a653cdc 100644
--- a/usr/module/system/src/Controller/Front/LoginController.php
+++ b/usr/module/system/src/Controller/Front/LoginController.php
@@ -46,9 +46,13 @@ public function indexAction()
 
         // Display login form
         $form = $this->getForm();
-        $redirect = $this->params('redirect') ?: $this->request->getServer('HTTP_REFERER');
-        if ($redirect) {
-            $form->setData(array('redirect' => urlencode($redirect)));
+        $redirect = $this->params('redirect');
+        if (null === $redirect) {
+            $redirect = $this->request->getServer('HTTP_REFERER');
+        }
+        if (null !== $redirect) {
+            $redirect = $redirect ? urlencode($redirect) : '';
+            $form->setData(array('redirect' => $redirect));
         }
         $this->renderForm($form);
     }
diff --git a/usr/module/system/src/Controller/Front/ProfileController.php b/usr/module/system/src/Controller/Front/ProfileController.php
index 275df0167a..fa550c6bcc 100644
--- a/usr/module/system/src/Controller/Front/ProfileController.php
+++ b/usr/module/system/src/Controller/Front/ProfileController.php
@@ -32,7 +32,7 @@ public function indexAction()
     {
         $id = $this->params('id');
         if (!$id) {
-            $this->redirect()->toRoute('user');
+            $this->redirect()->toRoute('user', array('controller' => 'account'));
             return;
         }
         if (is_numeric($id)) {
diff --git a/usr/module/system/src/Controller/Front/RegisterController.php b/usr/module/system/src/Controller/Front/RegisterController.php
index 0029ece431..f5fc0e166a 100644
--- a/usr/module/system/src/Controller/Front/RegisterController.php
+++ b/usr/module/system/src/Controller/Front/RegisterController.php
@@ -34,6 +34,12 @@ public function indexAction()
             return;
         }
 
+        // If already logged in
+        if (Pi::service('authentication')->hasIdentity()) {
+            $this->redirect()->toRoute('user', array('controller' => 'account'));
+            return;
+        }
+
         // Display register form
         $form = $this->getForm();
         $this->renderForm($form);
diff --git a/usr/module/system/src/Form/LoginForm.php b/usr/module/system/src/Form/LoginForm.php
index 243723f9d1..8baa50b500 100644
--- a/usr/module/system/src/Form/LoginForm.php
+++ b/usr/module/system/src/Form/LoginForm.php
@@ -89,12 +89,17 @@ public function init()
             'type'  => 'csrf',
         ));
 
-        $redirect = Pi::engine()->application()->getRequest()->getServer('HTTP_REFERER') ?: Pi::engine()->application()->getRequest()->getRequestUri();
+        $request = Pi::engine()->application()->getRequest();
+        $redirect = $request->getQuery('redirect');
+        if (null === $redirect) {
+            $redirect = $request->getServer('HTTP_REFERER') ?: $request->getRequestUri();
+        }
+        $redirect = $redirect ? urlencode($redirect) : '';
         $this->add(array(
             'name'  => 'redirect',
             'type'  => 'hidden',
             'attributes'    => array(
-                'value' => urlencode($redirect),
+                'value' => $redirect,
             ),
         ));
 
diff --git a/usr/module/system/template/admin/member-index.phtml b/usr/module/system/template/admin/member-index.phtml
index 09bcb3ccc8..ef9dfc294d 100644
--- a/usr/module/system/template/admin/member-index.phtml
+++ b/usr/module/system/template/admin/member-index.phtml
@@ -10,7 +10,7 @@
 <form method='GET'>
     <?php _e('Select a role: '); ?><select id='role-selection' list-url='<?php echo $this->url('admin', array('controller' => 'member', 'action' => 'role', 'role' => '')) ?>'>
     <?php foreach ($roles as $roleName => $roleTitle) { ?>
-        <option value="<?php echo $roleName; ?>"<?php if ($role == $roleName) { echo ' selected'; } ?>><?php echo $this->escape($roleTitle); ?></option>
+        <option value="<?php echo $roleName; ?>"<?php if (isset($role) && $role == $roleName) { echo ' selected'; } ?>><?php echo $this->escape($roleTitle); ?></option>
     <?php } ?>
     </select>
 </form>
diff --git a/www/setup/src/Controller/Admin.php b/www/setup/src/Controller/Admin.php
index 82add49853..fb06eb3d01 100644
--- a/www/setup/src/Controller/Admin.php
+++ b/www/setup/src/Controller/Admin.php
@@ -34,7 +34,7 @@ public function init()
 
         $vars = $this->wizard->getPersist('siteconfig');
         if (empty($vars)) {
-            $vars['adminname'] = 'root';
+            $vars['adminname'] = 'admin';
             $hostname = preg_replace('/^www\./i', '', $_SERVER['SERVER_NAME']);
             if (false === strpos($hostname, '.')) {
                 $hostname .= '.com';
diff --git a/www/setup/src/Controller/Finish.php b/www/setup/src/Controller/Finish.php
index 5ab8acd6ec..a5edb14d37 100644
--- a/www/setup/src/Controller/Finish.php
+++ b/www/setup/src/Controller/Finish.php
@@ -18,6 +18,7 @@
  */
 
 namespace Pi\Setup\Controller;
+
 use Pi;
 use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
@@ -35,7 +36,6 @@ public function indexAction()
     {
         $wizard = $this->wizard;
         $vars = $wizard->getPersist('paths');
-        //$this->normalizeHost($vars);
         $configs = array();
 
         /**#@+
@@ -50,12 +50,6 @@ public function indexAction()
             }
         }
         $content = str_replace('%host%', $vars['config']['path'] . '/host.php', $content);
-        /*
-        $content = preg_replace('/(define\()([\'"])(PI_PATH_LIB)\\2,\s*([\'"])(.*?)\\4\s*\)/', 'define(\'PI_PATH_LIB\', \'' . $vars['lib']['path'] . '\')', $content);
-        $content = preg_replace('/(define\()([\'"])(PI_PATH_WWW)\\2,\s*([\'"])(.*?)\\4\s*\)/', 'define(\'PI_PATH_WWW\', \'' . $vars['www']['path'] . '\')', $content);
-        $content = preg_replace('/(define\()([\'"])(PI_PATH_VAR)\\2,\s*([\'"])(.*?)\\4\s*\)/', 'define(\'PI_PATH_VAR\', \'' . $vars['var']['path'] . '\')', $content);
-        $content = preg_replace('/(define\()([\'"])(PI_PATH_HOST)\\2,\s*([\'"])(.*?)\\4\s*\)/', 'define(\'PI_PATH_HOST\', \'' . $vars['config']['path'] . '/host.php\')', $content);
-        */
         $configs[] = array('file' => $file, 'content' => $content);
         /**#@-*/
 
@@ -99,16 +93,16 @@ public function indexAction()
         $readPaths .= "</ul>";
 
         $message = <<<'HTML'
-<h2>Congratulatons! The system is set up successfully. <a href='../index.php'>Click to visit your website!</a></h2>
+<h2>Congratulatons! The system is set up successfully. <a href='../index.php?redirect=0'>Click to visit your website!</a></h2>
 <h3>Security advisory</h3>
 <ol>For security considerations please make sure the following operations are done:
-    <li>Remove the installation folder <strong>%s</strong> from your server.</li>
+    <li>Remove the installation folder <strong>{www}/setup/</strong> from your server manually.</li>
     <li>Set configuration directories and files to readonly: %s</li>
 </ol>
 <h3>Support</h3>
 <p>Visit <a href='http://www.xoopsengine.org/' rel='external'>Pi Engine Development Site</a> in case you need any help.</p>
 HTML;
-        $this->content = sprintf(_t($message), basename(dirname(__DIR__)), $readPaths);
+        $this->content = sprintf(_t($message), $readPaths);
 
         $path = Pi::path('cache');
         $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST);