diff --git a/templates/login.tpl b/templates/login.tpl
index 090dadf9..a6e7ad21 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -10,37 +10,37 @@
-
-
{if $logintype=='admin'}{$PALANG.pLogin_welcome}
- {else}{$PALANG.pUsersLogin_welcome}
- {/if}
+
+
+
{if $logintype=='admin'}{$PALANG.pLogin_welcome}{else}{$PALANG.pUsersLogin_welcome}{/if}
+
+
{if $logintype == 'admin'}
@@ -50,12 +50,8 @@
{/if}
- {literal}
-
- {/literal}
+
diff --git a/templates/users_edit-alias.tpl b/templates/users_edit-alias.tpl
index 714bb351..e25dfa5c 100644
--- a/templates/users_edit-alias.tpl
+++ b/templates/users_edit-alias.tpl
@@ -36,12 +36,15 @@