diff --git a/Admin/Templates/home.tpl b/Admin/Templates/home.tpl
index 82c0613a..4b3aa40a 100644
--- a/Admin/Templates/home.tpl
+++ b/Admin/Templates/home.tpl
@@ -31,7 +31,7 @@
 
 <br /><br /><br /><br />
 
-	Hello <b><?php echo $_SESSION['username']; ?></b>, You are logged in as: <b><font color="Red">Administrator</font></b></center>
+	Hello <b><?php echo $_SESSION['admin_username']; ?></b>, You are logged in as: <b><font color="Red">Administrator</font></b></center>
 	<br /><br /><br />
 
 	<br /><br /><br /><br /><br />
diff --git a/Admin/Templates/login.tpl b/Admin/Templates/login.tpl
index 1689618d..b581e9aa 100644
--- a/Admin/Templates/login.tpl
+++ b/Admin/Templates/login.tpl
@@ -33,7 +33,7 @@
 				<tr>
 					<td>Username</td>
 					<td>
-						<input class="fm fm110" type="text" name="name" value="<?php echo (isset($_SESSION['username']) ? $_SESSION['username'] : '')?>" maxlength="20">
+						<input class="fm fm110" type="text" name="name" value="<?php echo (isset($_SESSION['admin_username']) ? $_SESSION['admin_username'] : '')?>" maxlength="20">
 					</td>
 				</tr>
 				<tr>
diff --git a/Admin/Templates/resetdone.php b/Admin/Templates/resetdone.php
index dfc115dd..156e726a 100644
--- a/Admin/Templates/resetdone.php
+++ b/Admin/Templates/resetdone.php
@@ -8,7 +8,7 @@
 ##  Copyright:     TravianZ (c) 2012-2014. All rights reserved.                ##
 ##                                                                             ##
 #################################################################################
-unset($_SESSION['username'], $_SESSION['sessid']);
+unset($_SESSION['admin_username'], $_SESSION['sessid']);
 ?>
 <table id="member">
     <thead>
diff --git a/GameEngine/Admin/function.php b/GameEngine/Admin/function.php
index 0a3a5ced..d5cf7664 100755
--- a/GameEngine/Admin/function.php
+++ b/GameEngine/Admin/function.php
@@ -143,7 +143,7 @@ class funct {
   function LogIN($username,$password){
 	global $admin,$database;
 	if($admin->Login($username,$password)){
-	  //$_SESSION['username'] = $username;
+	  $_SESSION['admin_username'] = $username;
 	  $_SESSION['access'] = $database->getUserField($username,'access',1);
 	  $_SESSION['id'] = $database->getUserField($username,'id',1);
 	  header("Location: ".$_SERVER['HTTP_REFERER']);