diff --git a/action.php b/action.php
index 4b5eef6..50b0d77 100644
--- a/action.php
+++ b/action.php
@@ -1,23 +1,196 @@
 <?php
 /**
- * Action Plugin Prototype
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Christopher Smith <chris@jalakai.co.uk>
+ * Userhomepage plugin main file
+ * Previous authors: James GuanFeng Lin, Mikhail I. Izmestev, Daniel Stonier
+ * @author: Simon Delage <simon.geekitude@gmail.com>
+ * @license: CC Attribution-Share Alike 3.0 Unported <http://creativecommons.org/licenses/by-sa/3.0/>
  */
+
 // must be run within Dokuwiki
-if(!defined('DOKU_INC')) die();
+if (!defined('DOKU_INC')) die();
+if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
 
-/**
- * All DokuWiki plugins to interfere with the event system
- * need to inherit from this class
- */
-class DokuWiki_Action_Plugin extends DokuWiki_Plugin {
+require_once (DOKU_PLUGIN . 'action.php');
+require_once (DOKU_PLUGIN . '/acl/admin.php');
 
-    /**
-     * Registers a callback function for a given event
-     */
-    public function register(Doku_Event_Handler $controller) {
-        trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING);
+class action_plugin_userhomepage extends DokuWiki_Action_Plugin{
+
+    function register(&$controller) {
+//        $controller->register_hook('AUTH_LOGIN_CHECK', 'AFTER', $this, 'init',array());
+        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'init',array());
+        $controller->register_hook('ACTION_ACT_PREPROCESS', 'AFTER', $this, 'redirect',array());
     }
+
+    function init(&$event, $param) {
+        global $conf;
+        global $INFO;
+        // CREATE PRIVATE NAMESPACE START PAGE TEMPLATES IF NEEDED
+        if (($this->getConf('create_private_ns')) && (!file_exists(DOKU_INC.$this->getConf('templates_path').'/userhomepage_private.txt')) && ($_SERVER['REMOTE_USER'] != null)) {
+            // If old template exists, use it as source to create userhomepage_private.txt in templates_path
+            if (file_exists(DOKU_INC.$this->getConf('templatepath'))) {
+                $source = $this->getConf('templatepath');
+            } else {
+                $source = 'lib/plugins/userhomepage/lang/'.$conf['lang'].'/userhomepage_private.default';
+            }
+            $dest = $this->getConf('templates_path').'/userhomepage_private.txt';
+            $this->copyFile($source, $dest);
+        }
+        // CREATE PUBLIC PAGE TEMPLATES IF NEEDED
+        if (($this->getConf('create_public_page')) && (!file_exists(DOKU_INC.$this->getConf('templates_path').'/userhomepage_public.txt')) && ($_SERVER['REMOTE_USER'] != null)) {
+            $source = 'lib/plugins/userhomepage/lang/'.$conf['lang'].'/userhomepage_public.default';
+            $dest = $this->getConf('templates_path').'/userhomepage_public.txt';
+            $this->copyFile($source, $dest);
+        }
+        // TARGETS
+        if ($this->getConf('group_by_name')) {
+            // private:s:simon or private:s:simon_delage
+            $this->private_ns = cleanID($this->getConf('users_namespace').':'.substr($this->privateNamespace(), 0, 1).':'. $this->privateNamespace());
+        } else {
+            // private:simon or private:simon_delage
+            $this->private_ns = cleanID($this->getConf('users_namespace').':'. $this->privateNamespace());
+        }
+        // ...:start.txt or ...:simon_delage.txt
+        $this->private_page = $this->private_ns . ':' . $this->privateStart();
+        // user:simon.txt
+        $this->public_page = cleanID($this->getConf('public_pages_ns').':'. $_SERVER['REMOTE_USER']);
+        // ACL
+        $acl = new admin_plugin_acl();
+        // For private namespace
+        if (($this->getConf('create_private_ns')) && ($this->getConf('set_permissions'))) {
+            // If use_name_string or group_by_name is enabled, we can't use ACL wildcard
+            if (($this->getConf('use_name_string')) or ($this->getConf('group_by_name'))) {
+                $ns = $this->private_ns.':*';
+                if ($_SERVER['REMOTE_USER'] != null) $acl->_acl_add($ns, strtolower($_SERVER['REMOTE_USER']), AUTH_DELETE);
+            } else {
+                $acl->_acl_add(cleanID($this->getConf('users_namespace')).':%USER%:*', '%USER%', AUTH_DELETE);
+            }
+            $acl->_acl_add(cleanID($this->getConf('users_namespace')).':*', '@ALL', (int)$this->getConf('set_permissions_others'));
+        }
+        // For public user pages
+        if (($this->getConf('create_public_page')) && ($this->getConf('set_permissions_public'))) {
+            $acl->_acl_add(cleanID($this->getConf('public_pages_ns')).':%USER%', '%USER%', AUTH_EDIT);
+            // If both private and public namespaces are identical, we need more ACL to force read rights for @ALL on public pages
+            if ($this->getConf('users_namespace') == $this->getConf('public_pages_ns')) {
+                foreach (glob("data/pages/".$this->getConf('public_pages_ns')."/*.txt") as $filename) {
+                    $acl->_acl_add($this->getConf('public_pages_ns').':'.explode('.', end(explode('/', $filename)))[0], '@ALL', AUTH_READ);
+                }
+            // Otherwise we just need to give read access to @ALL on public pages namespace
+            } else {
+                $acl->_acl_add(cleanID($this->getConf('public_pages_ns')).':*', '@ALL', AUTH_READ);
+            }
+        }
+        // If we changed some ACL, we probably duplicated some lines
+        if (($this->getConf('set_permissions')) or ($this->getConf('set_permissions_public'))) {
+            // Some lines in conf/acl.auth.php file have probably been duplicated so let's read the file
+            $lines = file(DOKU_INC.'conf/acl.auth.php');
+            // And only keep unique lines (OK, we loose an empty comment line...)
+            $lines = array_unique($lines);
+            // Write things back to conf/acl.auth.php
+            file_put_contents(DOKU_INC.'conf/acl.auth.php', implode($lines));
+        }
+    }
+
+    function copyFile($source = null, $dest = null) {
+        if (!copy(DOKU_INC.$source, DOKU_INC.$dest)) {
+            msg($this->getLang('copyerror').' ('.$source.' > '.$dest.')', -1);
+        } else {
+            msg($this->getLang('copysuccess').' ('.$source.' > '.$dest.')', 1);
+        }
+    }
+
+    function redirect(&$event, $param) {
+        global $conf;
+        global $INFO;
+        global $lang;
+        $created = array();
+        // If user just logged in
+        if (($_SERVER['REMOTE_USER']!=null)&&($_REQUEST['do']=='login')) {
+            // if private page doesn't exists, create it (from template)
+            if ($this->getConf('create_private_ns') && !page_exists($this->private_page) && !checklock($this->private_page) && !checkwordblock()) {
+                // Target private start page template
+                $this->private_page_template = DOKU_INC.$this->getConf('templates_path').'/userhomepage_private.txt';
+                // Create private page
+                lock($this->private_page);
+                saveWikiText($this->private_page,$this->applyTemplate('private'),'Automatically created');
+                unlock($this->private_page);
+                // Announce private namespace was created
+                msg($this->getLang('createdprivatens').' ('.$this->private_page.')', 0);
+                // Note that we created private page
+                $created['private'] = true;
+            }
+            // Public page?
+            // If public page doesn't exists, create it (from template)
+            if ($this->getConf('create_public_page') && !page_exists($this->public_page) && !checklock($this->public_page) && !checkwordblock()) {
+                // Target public page template
+                $this->public_page_template = DOKU_INC.$this->getConf('templates_path').'/userhomepage_public.txt';
+                // Create public page
+                lock($this->public_page);
+                saveWikiText($this->public_page,$this->applyTemplate('public'),'Automatically created');
+                unlock($this->public_page);
+                // Announce plubic page was created
+                msg($this->getLang('createdpublicpage').' ('.$this->public_page.')', 0);
+                // Note that we created public page
+                $created['public'] = true;
+            }
+            // If Translation plugin is active, determine if we're at wikistart
+            if (!plugin_isdisabled('translation')) {
+                foreach (explode(' ',$conf['plugin']['translation']['translations']) as $lang){
+                    if (getID() === $lang.':'.$conf['start']) {
+                        $wikistart = true;
+                        break;
+                    }
+                }
+            }
+            // If Public page was just created, redirect to it and edit
+            if ($created['public']) {
+                send_redirect(wl($this->public_page, 'do=edit', false, '&'));
+            // Else if private start page was just created and edit option is set, redirect to it and edit
+            } elseif (($created['private']) && ($this->getConf('edit_before_create'))) {
+                send_redirect(wl($this->private_page, 'do=edit', false, '&'));
+            // Else if the user was not at a specific page (beside wiki start) and private page exists, redirect to it.
+            } elseif ((($_REQUEST['id']==$conf['start'])||(!isset($_REQUEST['id']))||($wikistart)) && (page_exists($this->private_page))) {
+                send_redirect(wl($this->private_page));
+            }
+        }
+    }
+
+    function privateNamespace() {
+        if ( $this->getConf('use_name_string')) {
+            global $INFO;
+            $raw_string = cleanID($INFO['userinfo']['name']);
+            // simon_delage
+            return $raw_string;
+        } else {
+            // simon
+            return strtolower($_SERVER['REMOTE_USER']);
+        }
+    }
+
+    function privateStart() {
+        if ($this->getConf('use_start_page')) {
+            global $conf;
+            return cleanID($conf['start']);
+        } else {
+            return $this->privateNamespace();
+        }
+    }
+
+    function applyTemplate($type) {
+        global $INFO;
+        if ($type == 'private') {
+            $content = io_readFile($this->private_page_template, false);
+        } elseif ($type == 'public') {
+            $content = io_readFile($this->public_page_template, false);
+        }
+        $content = str_replace('@TARGETPRIVATENS@', $this->private_ns, $content);
+        $content = str_replace('@TARGETPUBLICPAGE@', $this->public_page, $content);
+        $content = str_replace('@TARGETPUBLICNS@', cleanID($this->getConf('public_pages_ns')), $content);
+        // Improved template process to use standard replacement patterns from https://www.dokuwiki.org/namespace_templates based on code proposed by Christian Nancy
+        // Build a fake data structure for the parser
+        $data = array('tpl' => $content, 'id' => $this->private_page);
+        // Use the built-in parser
+        $content = parsePageTemplate($data);
+        return $content;
+    }
+
 }
diff --git a/conf/default.php b/conf/default.php
index 0de7401..4a3f3b2 100644
--- a/conf/default.php
+++ b/conf/default.php
@@ -12,7 +12,7 @@
     $conf['users_namespace'] = 'private';
     $conf['set_permissions'] = 1;
     $conf['set_permissions_others'] = '0';
-    $conf['group_by_name'] = 1;
+    $conf['group_by_name'] = 0;
     $conf['edit_before_create'] = 0;
     $conf['create_public_page'] = 0;
     $conf['public_pages_ns'] = 'user';
diff --git a/conf/metadata.php b/conf/metadata.php
index ec08801..0b1dc32 100644
--- a/conf/metadata.php
+++ b/conf/metadata.php
@@ -7,7 +7,7 @@
  */
 
     $meta['create_private_ns'] = array('onoff');
-    $meta['use_name_string'] = array('onoff','_caution' => 'warning');
+    $meta['use_name_string'] = array('onoff');
     $meta['use_start_page'] = array('onoff');
     $meta['users_namespace'] = array('string','_pattern' => '/^(|[a-zA-Z\-:]+)$/');
     $meta['set_permissions'] = array('onoff');
diff --git a/helper.php b/helper.php
index 018a12f..d7ba437 100644
--- a/helper.php
+++ b/helper.php
@@ -11,6 +11,7 @@ if(!defined('DOKU_INC')) die();
 
 class helper_plugin_userhomepage extends DokuWiki_Plugin {
 
+    // Returns the ID of current user's private namespace start page (even if it doesn't exist)
     function getPrivateID() {
         if ($this->getConf('group_by_name')) {
             // private:s:simon or private:s:simon_delage
@@ -23,10 +24,12 @@ class helper_plugin_userhomepage extends DokuWiki_Plugin {
         return $this->private_page = $this->private_ns.':'.$this->privateStart();
     }
 
+    // Returns the ID of current user's public page (even if it doesn't exist)
     function getPublicID() {
         return $this->public_page = cleanID($this->getConf('public_pages_ns').':'. $_SERVER['REMOTE_USER']);
     }
 
+    // Returns a link 
     function getPrivateLink($param=null) {
         global $INFO;
         global $lang;
diff --git a/plugin.info.txt b/plugin.info.txt
index ff3d885..57c66b7 100644
--- a/plugin.info.txt
+++ b/plugin.info.txt
@@ -1,7 +1,7 @@
 base     userhomepage
 author   Simon Delage
 email    simon.geekitude@gmail.com
-date     2014-09-03
+date     2014-09-11
 name     User Homepage
 desc     Automatically create user's private namespace and/or public page and redirects users to private namespace on login.
 url      https://www.dokuwiki.org/plugin:userhomepage