diff --git a/app/widgets/AdminMain/AdminMain.php b/app/widgets/AdminMain/AdminMain.php
index 1cf1ce4fd..2859aff3e 100644
--- a/app/widgets/AdminMain/AdminMain.php
+++ b/app/widgets/AdminMain/AdminMain.php
@@ -11,8 +11,16 @@ class AdminMain extends \Movim\Widget\Base
         $config = $cd->get();
 
         if(isset($form) && !empty($form)) {
-            unset($form['username']);
-            unset($form['password']);
+            if(isset($form['password'])
+            && isset($form['repassword'])
+            && $form['password'] != '' && $form['repassword'] != ''
+            && $form['password'] == $form['repassword']) {
+                $form['password'] = sha1($form['password']);
+            } else {
+                $form['password'] = $config->password;
+            }
+
+            unset($form['repassword']);
 
             foreach($form as $key => $value) {
                 $config->$key = $value;
diff --git a/app/widgets/AdminMain/adminmain.tpl b/app/widgets/AdminMain/adminmain.tpl
index 0d79d70ce..268c01b34 100644
--- a/app/widgets/AdminMain/adminmain.tpl
+++ b/app/widgets/AdminMain/adminmain.tpl
@@ -127,6 +127,24 @@
         </li>
     </ul>
 
+    <br />
+    <h3>{$c->__('credentials.title')}</h3>
+
+    <div>
+        <label for="username">{$c->__('credentials.username')}</label>
+        <input type="text" id="username" name="username" value="{$conf->username}"/>
+    </div>
+    <div class="clear"></div>
+
+    <div>
+        <input type="password" id="password" name="password" value="" placeholder="{$c->__('credentials.password')}"/>
+        <label for="password">{$c->__('credentials.password')}</label>
+    </div>
+    <div>
+        <input type="password" id="repassword" name="repassword" value="" placeholder="{$c->__('credentials.re_password')}"/>
+        <label for="repassword">{$c->__('credentials.re_password')}</label>
+    </div>
+
     <input
     type="submit"
     class="button color green oppose"
diff --git a/app/widgets/AdminMain/locales.ini b/app/widgets/AdminMain/locales.ini
index 9fa483924..df043a45c 100644
--- a/app/widgets/AdminMain/locales.ini
+++ b/app/widgets/AdminMain/locales.ini
@@ -16,7 +16,6 @@ publics       = Public WebSockets
 
 [credentials]
 title       = Administration Credential
-info        = Change the default credentials admin/password
 username    = Username
 password    = Password
 re_password = Retype password