diff --git a/admin/templates/default/account_form_buttons.tpl b/admin/templates/default/account_form_buttons.tpl
deleted file mode 100644
index 9694acd2db..0000000000
--- a/admin/templates/default/account_form_buttons.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-    <tr bgcolor="{tr_color2}">
-     <td colspan="4" align="right"><input type="submit" name="submit" value="{lang_button}"></td>
-    </tr>
\ No newline at end of file
diff --git a/admin/templates/default/account_form_ldap.tpl b/admin/templates/default/account_form_ldap.tpl
index 66b643d046..ea81230e1d 100644
--- a/admin/templates/default/account_form_ldap.tpl
+++ b/admin/templates/default/account_form_ldap.tpl
@@ -62,3 +62,13 @@
      <td colspan="4" align="right"><input type="submit" name="submit" value="{lang_button}"></td>
     </tr>
 <!-- END form_buttons_ -->
+
+<!-- BEGIN form_logininfo -->
+    <tr bgcolor="{tr_color1}">
+     <td>{lang_lastlogin}</td>
+     <td>{account_lastlogin}</td>
+
+     <td>{lang_lastloginfrom}</td>
+     <td>{account_lastloginfrom}</td>
+    </tr>
+<!-- END form_logininfo -->
diff --git a/admin/templates/default/account_form_logininfo.tpl b/admin/templates/default/account_form_logininfo.tpl
deleted file mode 100644
index e8bb15107a..0000000000
--- a/admin/templates/default/account_form_logininfo.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-    <tr bgcolor="{tr_color1}">
-     <td>{lang_lastlogin}</td>
-     <td>{account_lastlogin}</td>
-
-     <td>{lang_lastloginfrom}</td>
-     <td>{account_lastloginfrom}</td>
-    </tr>
diff --git a/admin/templates/default/account_form_password.tpl b/admin/templates/default/account_form_password.tpl
deleted file mode 100644
index 09b54d2b16..0000000000
--- a/admin/templates/default/account_form_password.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-    <tr bgcolor="{tr_color1}">
-     <td>{lang_password}</td>
-     <td><input type="password" name="account_passwd" value="{account_passwd}"></td>
-     <td>{lang_reenter_password}</td>
-     <td><input type="password" name="account_passwd_2" value="{account_passwd_2}"></td>
-    </tr>