diff --git a/Controller.php b/Controller.php
index 734f0b4..fe4f3f1 100644
--- a/Controller.php
+++ b/Controller.php
@@ -389,6 +389,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $account->setName2($request->getData('name2'));
         $account->setName3($request->getData('name3'));
         $account->setEmail($request->getData('email'));
+        $account->generatePassword($request->getData('password'));
 
         AccountMapper::create($account);
 
diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php
index 1e87413..35054d0 100644
--- a/Models/AccountMapper.php
+++ b/Models/AccountMapper.php
@@ -108,9 +108,9 @@ class AccountMapper extends DataMapperAbstract
 
             return false;
         }
-    }
 
-        
+        return $objId;
+    }
 
     /**
      * Get object.
diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index f64650d..716d624 100644
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -44,7 +44,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><label for="iEmail"><?= $this->getText('Email') ?></label>
                 <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com">
                 <tr><td><label for="iPassword"><?= $this->getText('Name3') ?></label>
-                <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
+                <tr><td><input id="iPassword" name="password" type="password" placeholder="&#xf023; Pa55ssw0rd?">
                 <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index f9acb48..1f5fdc0 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -26,7 +26,7 @@ echo $this->getData('nav')->render(); ?>
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/account'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iId"><?= $this->getText('ID') ?></label>
+                <tr><td><label for="iId"><?= $this->getText('ID', 0, 0) ?></label>
                 <tr><td><input id="iId" name="id" type="text" value="<?= $account->getId(); ?>" disabled>
                 <tr><td><label for="iType"><?= $this->getText('Type') ?></label>
                 <tr><td><select id="iType" name="type">
@@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
                             <option value="<?= \phpOMS\Account\AccountStatus::BANNED; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : ''; ?>><?= $this->getText('Banned') ?>
                         </select>
                 <tr><td><label for="iUsername"><?= $this->getText('Username') ?></label>
-                <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= $account->getEmail(); ?>" disabled>
+                <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= $account->getName(); ?>" disabled>
                 <tr><td><label for="iName1"><?= $this->getText('Name1') ?></label>
                 <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" value="<?= $account->getName1(); ?>" required>
                 <tr><td><label for="iName2"><?= $this->getText('Name2') ?></label>
@@ -52,7 +52,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= $account->getEmail(); ?>">
                 <tr><td><label for="iPassword"><?= $this->getText('Name3') ?></label>
                 <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Save', 0, 0); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/accounts-create.tpl.php b/Theme/backend/accounts-create.tpl.php
index f64650d..716d624 100644
--- a/Theme/backend/accounts-create.tpl.php
+++ b/Theme/backend/accounts-create.tpl.php
@@ -44,7 +44,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><label for="iEmail"><?= $this->getText('Email') ?></label>
                 <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com">
                 <tr><td><label for="iPassword"><?= $this->getText('Name3') ?></label>
-                <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
+                <tr><td><input id="iPassword" name="password" type="password" placeholder="&#xf023; Pa55ssw0rd?">
                 <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
             </table>
         </form>
diff --git a/Theme/backend/accounts-single.tpl.php b/Theme/backend/accounts-single.tpl.php
index f9acb48..1f5fdc0 100644
--- a/Theme/backend/accounts-single.tpl.php
+++ b/Theme/backend/accounts-single.tpl.php
@@ -26,7 +26,7 @@ echo $this->getData('nav')->render(); ?>
         <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/admin/account'); ?>" method="post">
             <table class="layout wf-100">
                 <tbody>
-                <tr><td><label for="iId"><?= $this->getText('ID') ?></label>
+                <tr><td><label for="iId"><?= $this->getText('ID', 0, 0) ?></label>
                 <tr><td><input id="iId" name="id" type="text" value="<?= $account->getId(); ?>" disabled>
                 <tr><td><label for="iType"><?= $this->getText('Type') ?></label>
                 <tr><td><select id="iType" name="type">
@@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
                             <option value="<?= \phpOMS\Account\AccountStatus::BANNED; ?>"<?= $account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : ''; ?>><?= $this->getText('Banned') ?>
                         </select>
                 <tr><td><label for="iUsername"><?= $this->getText('Username') ?></label>
-                <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= $account->getEmail(); ?>" disabled>
+                <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= $account->getName(); ?>" disabled>
                 <tr><td><label for="iName1"><?= $this->getText('Name1') ?></label>
                 <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" value="<?= $account->getName1(); ?>" required>
                 <tr><td><label for="iName2"><?= $this->getText('Name2') ?></label>
@@ -52,7 +52,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= $account->getEmail(); ?>">
                 <tr><td><label for="iPassword"><?= $this->getText('Name3') ?></label>
                 <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
-                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>">
+                <tr><td><input type="submit" value="<?= $this->getText('Save', 0, 0); ?>">
             </table>
         </form>
     </div>