diff --git a/core/SDL/class.account.php b/core/SDL/class.account.php
index 7c37f76..8b45fe0 100644
--- a/core/SDL/class.account.php
+++ b/core/SDL/class.account.php
@@ -670,10 +670,14 @@ function delete_key($key)
 // POST account id, reason, and banned by.
 // @$banip: 1 = yes, ban the IP as well, 0 = Dont ban IP
 	
-	function banAccount($bannid, $banreason, $bannedby, $banip = 0)
+	function banAccount($bannid, $banreason, $banduration, $bannedby, $banip = 0)
 	{
-		$timez = time();
-		$unban = $timez - 10;
+		$starttime = time();
+		if($banduration > 0)
+			$endtime = $starttime + $banduration;
+		else
+			$endtime = 0;
+		
 		$this->DB->query("INSERT INTO `account_banned`(
 			`id`, 
 			`bandate`, 
@@ -683,8 +687,8 @@ function banAccount($bannid, $banreason, $bannedby, $banip = 0)
 			`active`) 
 		   VALUES(
 			'".$bannid."', 
-			'".$timez."', 
-			'". $unban ."',
+			'".$starttime."', 
+			'".$endtime."',
 			'".$bannedby."',
 			'".$banreason."',
 			'1')
@@ -702,14 +706,14 @@ function banAccount($bannid, $banreason, $bannedby, $banip = 0)
 				`banreason`) 
 			   VALUES(
 				'". $getip ."', 
-				'". $timez ."', 
-				'". $unban ."',
+				'". $starttime ."', 
+				'". $endtime ."',
 				'". $bannedby ."', 
 				'". $banreason. "')
 			");
 		}
 		
-		$this->DB->query("UPDATE `mw_account_extend` SET `account_level`=5 WHERE account_id='".$bannid."'");
+		//$this->DB->query("UPDATE `mw_account_extend` SET `account_level`=5 WHERE account_id='".$bannid."'");
 		return TRUE;
 	}
 	
diff --git a/core/core.php b/core/core.php
index 538bf5a..478b316 100644
--- a/core/core.php
+++ b/core/core.php
@@ -10,8 +10,8 @@
 
 class Core
 {
-	var $version = '4.0.0';
-	var $version_date = '2017-01-20, 22:50';
+	var $version = '4.0.3';
+	var $version_date = '2017-01-28, 00:15';
 	var $exp_dbversion = '1.0a';
 
 	function __construct()
diff --git a/inc/account/account.manage.php b/inc/account/account.manage.php
index 92ec5b9..7c418ac 100644
--- a/inc/account/account.manage.php
+++ b/inc/account/account.manage.php
@@ -42,7 +42,11 @@
 
 function changeEmail()
 {
-	global $lang, $user, $Account, $DB;
+	global $lang, $user, $Account, $DB, $Config;
+
+	if(!$Config->get('allow_user_emailchange'))
+		return TRUE;
+	
 	$newemail = trim($_POST['email']);
 	
 	// First we check if the email is valid
@@ -86,7 +90,7 @@ function changePass()
 	{
 		if($Account->setPassword($user['id'], $newpass) == TRUE)
 		{
-			output_message('success', $lang['change_pass_success']);
+			output_message('success', $lang['change_pass_success'].'</b><meta http-equiv=refresh content="4;url=?p=account&sub=manage">');
 		}
 		else
 		{
diff --git a/inc/admin/body_header.php b/inc/admin/body_header.php
index 4ab6a47..787f0f2 100644
--- a/inc/admin/body_header.php
+++ b/inc/admin/body_header.php
@@ -9,11 +9,6 @@
 /****************************************************************************/
 
 // Block out all users who arent admins
-if($user['account_level'] == 5) 
-{
-	echo "You Are Banned";
-	die();
-}
 if($user['account_level'] <= 2) 
 {
 	redirect('index.php',1);
diff --git a/inc/admin/script_files/admin.users.php b/inc/admin/script_files/admin.users.php
index 78d26a6..2c49642 100644
--- a/inc/admin/script_files/admin.users.php
+++ b/inc/admin/script_files/admin.users.php
@@ -65,7 +65,7 @@ function changePass()
 	{
 		if($Account->setPassword($_GET['id'], $newpass) == TRUE)
 		{
-			output_message('success','<b>Password set successfully! Please wait while your redirected...</b>
+			output_message('success','<b>Password set successfully! Please wait while you are redirected...</b>
 			<meta http-equiv=refresh content="3;url=?p=admin&sub=users&id='.$_GET['id'].'">');
 		}
 		else
@@ -136,7 +136,7 @@ function editUser()
 			`total_donations`='".$_POST['total_donations']."'
 		  WHERE `account_id`='".$_GET['id']."'
 		");
-		output_message('success','User Updated Successfully! Please wait while your redirected...
+		output_message('success','User Updated Successfully! Please wait while you are redirected...
 			<meta http-equiv=refresh content="3;url=?p=admin&sub=users&id='.$_GET['id'].'">');
 	}
 }
@@ -148,7 +148,7 @@ function unBan($unbanid)
 	if($Account->unbanAccount($unbanid) == TRUE)
 	{
 		output_message('success','Success. Account #'.$unbanid.' Successfully Un-Banned!
-			Please wait while your redirected... <meta http-equiv=refresh content="3;url=?p=admin&sub=users&id='.$_GET['id'].'"');
+			Please wait while you are redirected... <meta http-equiv=refresh content="3;url=?p=admin&sub=users&id='.$_GET['id'].'"');
 	}	
 }
 
@@ -163,14 +163,14 @@ function deleteUser($did)
 }
 
 // Ban user
-function banUser($bannid, $banreason) 
+function banUser($bannid, $banreason, $banduration, $banip) 
 {
 	global $DB, $user, $Account;
 	if(!$banreason) 
 	{
 		$banreason = "Not Specified";
 	}
-	if($Account->banAccount($bannid, $banreason, $user['username']) == TRUE)
+	if($Account->banAccount($bannid, $banreason, $banduration, $user['username'], $banip) == TRUE)
 	{
 		output_message('success','Success. Account #'.$bannid.' Successfully banned. Reason: '.$banreason.'');
 	}
@@ -182,37 +182,53 @@ function showBanForm($banid)
 {
 	global $DB;
 	$unme = $DB->selectCell("SELECT username FROM account WHERE id='".$banid."'");
-	echo "
-		<div class=\"content\">	
-			<div class=\"content-header\">
-				<h4><a href=\"?p=admin\">Main Menu</a> / <a href=\"?p=admin&sub=users\">Manage Users</a> / ".$unme." / Ban</h4>
+	?>
+		<div class="content">	
+			<div class="content-header">
+				<h4><a href="?p=admin">Main Menu</a> / <a href="?p=admin&sub=users">Manage Users</a> / <a href="?p=admin&sub=users&id=<?= $_GET['id'];?>"><?= $unme;?></a> / Ban</h4>
 			</div> <!-- .content-header -->				
-			<div class=\"main-content\">
-	";
-	if(isset($_POST['ban_user'])) 
+		<div class=\"main-content\">
+	<?php
+	if(isset($_POST['ban_reason'])) 
 	{
-		banUser($_POST['ban_user'],$_POST['ban_reason']);
+		banUser($_GET['id'], $_POST['ban_reason'], $_POST['ban_duration'], isset($_POST['ban_ip']));
 	}
-	echo "
-		<form method=\"POST\" action=\"?p=admin&sub=users&id=".$banid."&action=ban\" name=\"adminform\" class=\"form label-inline\">
-			<input type='hidden' name='ban_user'  value='".$banid."' />
+	?>
+		<form method="POST" name="adminform" class="form label-inline">
 			<table>
 				<thead>
-					<th><center><b>Ban Account #".$banid." (".$unme.")</b></center></th>
+					<th><center><b>Ban Account #<?= $banid;?> (<?= $unme;?>)</b></center></th>
 				</thead>
 			</table>
 			<br />
 			<div class='field'>
-				<label for='Username'>Ban Reason: </label>
-				<input id='Username' name='ban_reason' size='20' type='text' class='large' />
+				<label for='ban_reason'>Ban Reason: </label>
+				<input id='ban_reason' name='ban_reason' size='20' type='text' class='large' />
 			</div>
-			
-			<div class=\"buttonrow-border\">								
+			<div class='field'>
+				<label for='ban_duration'>Ban Duration: </label>
+				<select id='ban_duration' name='ban_duration' class='large'>
+					<option value="0" selected="selected">Indefinite</option>
+					<option value="3600">1 hour</option>
+					<option value="14400">4 hours</option>
+					<option value="28800">8 hours</option>
+					<option value="86400">1 day</option>
+					<option value="172800">2 days</option>
+					<option value="259200">3 days</option>
+					<option value="345600">4 days</option>
+					<option value="640800">7 days</option>
+				</select>
+			</div>
+			<div class='field'>
+				<label for='ban_ip'>Ban IP Address: </label>
+				<input id='ban_ip' name='ban_ip' type='checkbox' value='1' />
+			</div>
+			<div class="buttonrow-border">								
 				<center><button><span>Ban User</span></button></center>			
 			</div>
 
 		</form>
 	</div>
-	";
+	<?php
 }
 ?>
diff --git a/inc/admin/template_files/admin.banlist.php b/inc/admin/template_files/admin.banlist.php
index 8679f99..0d4948e 100644
--- a/inc/admin/template_files/admin.banlist.php
+++ b/inc/admin/template_files/admin.banlist.php
@@ -14,6 +14,71 @@
 		<h4><a href="?p=admin">Main Menu</a> / Banlist</h4>
 	</div> <!-- .content-header -->				
 	<div class="main-content">
-		<br /><font color="red"><center><b>Under Construction</b><br />Remember, this is just a preview, and not everything is finished yet!</center></font>
+		<table>
+			<thead>
+				<th><center><b>Account Bans</center></b></th>
+			</thead>
+		</table>
+		<table width="95%">
+		<thead>
+			<tr>
+				<th width="15%"><b><center>Username</center></b></th>
+				<th width="20%"><b><center>Ban Date</center></b></th>
+				<th width="15%"><b><center>Banned By</center></b></th>
+				<th width="50%"><b>Ban Reason</b></th>
+			</tr>
+		</thead>
+		<?php
+		$ban_list = $DB->select("SELECT account.id, username, bandate, bannedby, banreason FROM account_banned JOIN account ON account.id = account_banned.id WHERE active='1' ORDER BY bandate DESC");
+		if($ban_list)
+		{
+			foreach($ban_list as $row)
+			{
+		?>
+			<tr class="content">
+				<td align="center"><a href="?p=admin&sub=users&id=<?= $row['id'];?>"><?php echo $row['username']; ?></a></td>
+				<td align="center"><?php echo date("Y-m-d @ G:i", $row['bandate']); ?></td>
+				<td align="center"><?php echo $row['bannedby']; ?></td>
+				<td align="left"><?php echo $row['banreason']; ?></td>
+			</tr>
+		<?php
+			}
+		}
+		?>
+		</table>
+		<br />
+		<br />
+		<table>
+			<thead>
+				<th><center><b>IP Address Bans</center></b></th>
+			</thead>
+		</table>
+		<table width="95%">
+		<thead>
+			<tr>
+				<th width="15%"><b><center>IP Address</center></b></th>
+				<th width="20%"><b><center>Ban Date</center></b></th>
+				<th width="15%"><b><center>Banned By</center></b></th>
+				<th width="50%"><b>Ban Reason</b></th>
+			</tr>
+		</thead>
+		<?php
+		$ban_list = $DB->select("SELECT ip, bandate, bannedby, banreason FROM ip_banned ORDER BY bandate DESC");
+		if($ban_list)
+		{
+			foreach($ban_list as $row)
+			{
+		?>
+			<tr class="content">
+				<td align="center"><?php echo $row['ip']; ?></td>
+				<td align="center"><?php echo date("Y-m-d @ G:i", $row['bandate']); ?></td>
+				<td align="center"><?php echo $row['bannedby']; ?></td>
+				<td align="left"><?php echo $row['banreason']; ?></td>
+			</tr>
+		<?php
+			}
+		}
+		?>
+		</table>
 	</div>
 </div>
\ No newline at end of file
diff --git a/inc/admin/template_files/admin.users.php b/inc/admin/template_files/admin.users.php
index dd58487..5b74a11 100644
--- a/inc/admin/template_files/admin.users.php
+++ b/inc/admin/template_files/admin.users.php
@@ -35,16 +35,27 @@
 		else
 		{
 			$profile = $Account->getProfile($_GET['id']);
-			$lastvisit = date("Y-m-d, g:i a", $profile['last_visit']);
-			$seebanned = $DB->num_rows("SELECT id FROM account_banned WHERE id='".$_GET['id']."' AND `active`=1");
-			if($seebanned > 0) 
+			$lastvisit = date("Y-m-d @ G:i", $profile['last_visit']);
+			$banned = $DB->selectRow("SELECT id, unbandate FROM account_banned WHERE id='".$_GET['id']."' AND `active`=1");
+			$acctstatus = "<font color=green>Active</font>";
+		
+			if($banned['id']) 
 			{
 				$bann = 1;
+				$ban_end = "Indefinite";
+
+				if($banned['unbandate'] > 0)
+					$ban_end = date("Y-m-d @ G:i", $banned['unbandate']);
+				
+				$acctstatus = "<font color=red>Banned</font> (Until: ".$ban_end.")";
 			}
 			else
 			{
 				$bann = 0;
 			}
+
+			if($profile['locked'])
+				$acctstatus = "<font color=orange>Not Activated</font>";
 ?>
 
 	<!-- Viewing an account -->
@@ -85,6 +96,11 @@
 						<th colspan="4"><center><b><?php echo $lang['general_stats']; ?></center></b></th>
 					</thead>
 					<tbody>
+						<tr>
+							<!-- Account Status -->
+							<td width="25%" align="right">Account Status: </td>
+							<td width="40%" align="left" colspan="3"><?php echo $acctstatus; ?></td>
+						</tr>
 						<tr>
 							<!-- Register Date -->
 							<td width="25%" align="right"><?php echo $lang['reg_date']; ?>: </td>
@@ -117,14 +133,13 @@
 							<td width="25%" align="right"><?php echo $lang['total_donations']; ?>: </td>
 							<td width="25%" align="left">$<?php echo $profile['total_donations']; ?></td>
 						</tr>
-						
 					</tbody>
 				</table>
 				<table>
 					<tr>
 						<td align="center" style="padding: 5px 5px 5px 5px;">
 						<a href="?p=admin&sub=users&id=<?php echo $_GET['id']; ?>&action=delete" onclick="return confirm('Are you sure? This is Un-reversable!');">
-							<b><font color="red"><?php echo $lang['delete_account']; ?></font></b></a> ||
+							<b><font color="red"><?php echo $lang['delete_account']; ?></font></b></a> |
 						<?php
 							if($bann == 1) 
 							{
@@ -238,11 +253,7 @@
 						<label for="account_level"><?php echo $lang['account_level']; ?>: </label>
 						<select name="account_level" class='small'>
 							<?php
-								if($profile['account_level'] == 5)
-								{
-									echo "<option value='5' selected='selected'>Banned</option>";
-								}
-								elseif($profile['account_level'] == 4)
+								if($profile['account_level'] == 4)
 								{
 									echo "<option value='4' selected='selected'>Super Admin</option>
 										  <option value='3'>Admin</option>
@@ -305,6 +316,36 @@
 					</div>
 				</form>
 			
+		<!-- Ban history -->
+				<br />
+				<br />
+				<table>
+					<thead>
+						<th><center><b>Ban History</center></b></th>
+					</thead>
+				</table>
+				<table width="95%">
+				<thead>
+					<tr>
+						<th width="20%"><b><center>Ban Date</center></b></th>
+						<th width="20%"><b><center>Banned By</center></b></th>
+						<th width="60%"><b>Ban Reason</b></th>
+					</tr>
+				</thead>
+			<?php
+				$ban_history = $DB->select("SELECT bandate, bannedby, banreason FROM account_banned WHERE id='".$_GET['id']."'");
+				foreach($ban_history as $row)
+				{
+			?>
+				<tr class="content">
+					<td align="center"><?php echo date("Y-m-d @ G:i", $row['bandate']); ?></td>
+					<td align="center"><?php echo $row['bannedby']; ?></td>
+					<td align="left"><?php echo $row['banreason']; ?></td>
+				</tr>
+			<?php
+				}
+			?>
+			</table>
 			</div> <!-- Main Content -->
 		</div> <!-- Content -->
 
@@ -383,17 +424,26 @@
 						<th width="120"><b><center><?php echo $lang['username']; ?></center></b></th>
 						<th width="140"><b><center><?php echo $lang['email']; ?></center></b></th>
 						<th width="120"><b><center><?php echo $lang['reg_date']; ?></center></b></th>
-						<th width="40"><b><center>Active/Ban</center></b></th>
+						<th width="40"><b><center>Status</center></b></th>
 					</tr>
 				</thead>
 				<?php
-				foreach($getusers as $row) { 
+				foreach($getusers as $row)
+				{
+					$isbanned =  $DB->num_rows("SELECT id FROM account_banned WHERE id='".$row['id']."' AND `active`=1");
 				?>
 				<tr class="content">
 					<td align="center"><a href="?p=admin&sub=users&id=<?php echo $row['id']; ?>"><?php echo $row['username']; ?></a></td>
 					<td align="center"><?php echo $row['email']; ?></td>
 					<td align="center"><?php echo $row['joindate']; ?></td>
-					<td align="center"><?php echo $row['locked']; ?></td>
+					<td align="center">
+					<?php 
+						if($row['locked'])
+							echo "<font color=\"orange\">Not Activated</font>";
+						elseif($isbanned > 0)
+							echo "<font color=\"red\">Banned</font>";
+					?>
+					</td>
 				</tr><?php } ?>
 			</table>
 			<div id="pg">
diff --git a/install/sql/full_install.sql b/install/sql/full_install.sql
index 1677043..a799ceb 100644
--- a/install/sql/full_install.sql
+++ b/install/sql/full_install.sql
@@ -1,19 +1,4 @@
 SET FOREIGN_KEY_CHECKS=0;
--- ----------------------------
--- Table structure for `mw_acc_creation_captcha`
--- ----------------------------
-DROP TABLE IF EXISTS `mw_acc_creation_captcha`;
-CREATE TABLE `mw_acc_creation_captcha` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `filename` varchar(200) NOT NULL DEFAULT '',
-  `key` varchar(200) NOT NULL DEFAULT '',
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
--- ----------------------------
--- Records of mw_acc_creation_captcha
--- ----------------------------
-
 -- ----------------------------
 -- Table structure for `mw_account_extend`
 -- ----------------------------
diff --git a/lang/English/admincp.php b/lang/English/admincp.php
index b54a257..3052dab 100644
--- a/lang/English/admincp.php
+++ b/lang/English/admincp.php
@@ -20,11 +20,11 @@
 	'ban_char_account' => 'Ban Characters Account',
 	'ban_list' => 'Ban List',
 	'cache_clear' => 'Clear Cache',
-	'cache_clear_success' => 'Cache cleared successfully! Please wait while your redirected...',
+	'cache_clear_success' => 'Cache cleared successfully! Please wait while you are redirected...',
 	'cache_expire_time' => 'Cache Expire Time',
 	'cache_expire_desc' => 'Time in seconds before each page needs to be re-cached. Default: 30 Min. (1800)',
 	'cache_settings' => 'Cache Settings',
-	'cache_settings_saved' => 'Finished! Cache Settings Successfully Updated. Please wait while your redirected...',
+	'cache_settings_saved' => 'Finished! Cache Settings Successfully Updated. Please wait while you are redirected...',
 	'cache_system' => 'Cache System',
 	'cache_system_desc' => 'Enable / Disable cache. Provides faster page loading, and lightens the load off the server.',
 	'cache_update' => 'Update Cache Settings',
diff --git a/lang/English/common.php b/lang/English/common.php
index cccd8ee..4f96431 100644
--- a/lang/English/common.php
+++ b/lang/English/common.php
@@ -4,7 +4,7 @@
 	'Accounts' => 'Accounts',
 	'account_has_no_characters' => 'You do not have any characters bound to your account!',
 	'account_info' => 'Account Info',
-	'account_update_success' => 'Account Information Updated! Please wait while your redirected...',
+	'account_update_success' => 'Account Information Updated! Please wait while you are redirected...',
 	'account_manage' => 'Account Managment',
 	'account_manange_intro' => 'Welcome to account management. Here you can edit all your settings. You can edit your password, email, secret questions, and expansion.',
 	'account_banned' => 'Your account is banned!',
diff --git a/templates/blizzlike/account/account.index.php b/templates/blizzlike/account/account.index.php
index 330e7ab..e82de35 100644
--- a/templates/blizzlike/account/account.index.php
+++ b/templates/blizzlike/account/account.index.php
@@ -1,6 +1,7 @@
 <br>
 <?php 
 builddiv_start(0, $lang['account']);
+$isbanned =  $DB->num_rows("SELECT id FROM account_banned WHERE id='".$user['id']."' AND active='1'");
 ?>
 <table width = "550" align='center'>
 	<tr>
@@ -17,7 +18,16 @@
 								<table border='0' cellspacing='0' cellpadding='4' width='540'>
 								<tr>
 									<td align='right' valign = "top" width='25%'><b>Account Status:</b></td>
-									<td align='left' valign = "top" width='25%'><font color='green'><b>Active</b></font></td>
+									<td align='left' valign = "top" width='25%'><b>
+								<?php 
+									if($user['locked'])
+										echo "<font color=\"orange\">Not Activated</font>";
+									elseif($isbanned > 0)
+										echo "<font color=\"red\">Banned</font>";
+									else
+										echo "<font color=\"green\">Active</font>";
+								?>
+									</b></td>
 									<td align='right' valign = "top" width='25%'><b>Vote Count:<b></td>
 									<td align='left' valign = "top" width='25%'><?php echo $user['total_votes']; ?></td>
 								</tr>
diff --git a/templates/blizzlike/account/account.login.php b/templates/blizzlike/account/account.login.php
index 58097f3..87057dd 100644
--- a/templates/blizzlike/account/account.login.php
+++ b/templates/blizzlike/account/account.login.php
@@ -41,7 +41,7 @@
 						<b><?php echo $lang['password'] ?></b> <input type="password" size="26" style="font-size:11px;" name="pass">
 					</div>
 					<div style="background:none;margin:1px;padding:6px 9px 0px 9px;text-align:center;width:70%;">
-						<input type="submit" size="16" class="button" style="font-size:12px;" value="<?php echo $lang['login'] ?>">
+						<input type="image" src="<?php echo $Template['path']; ?>/images/buttons/button-login.gif" class="button" style="font-size:12px;" value="<?php echo $lang['change'];?>">
 					</div>
 				</form>
 			</td>
@@ -51,7 +51,7 @@
 }
 else
 {
-    echo "<br /><br /><center><b>Welcome ".$user['username']."</b><br />".$lang['now_logged_in']."</center><br /><br />";
+	output_message('success','<b>Welcome '.$user['username'].'! '.$lang['now_logged_in'].'</b><meta http-equiv=refresh content="4;url=?p=account">');
 }
 ?>
 <?php builddiv_end() ?>
\ No newline at end of file
diff --git a/templates/blizzlike/account/account.manage.php b/templates/blizzlike/account/account.manage.php
index 847c4ec..2c86389 100644
--- a/templates/blizzlike/account/account.manage.php
+++ b/templates/blizzlike/account/account.manage.php
@@ -102,83 +102,58 @@
 								<tr>
 									<td>
 										<table border='0' cellspacing='0' cellpadding='4'>
-										<tr>
-											<td align='right' valign = "top" width='40%'>
-												<font face="arial,helvetica" size=-1><span><b><?php echo $lang['username'];?><br /></b></span></font>
-											</td>
-											<td align='left'>
-												<table border='0' cellspacing='0' cellpadding='0'>
-												<tr>
-													<td>
-														<input type='text' size='30' disabled="disabled" style="background-color:#FFFFFF" value='&nbsp;&nbsp;<?php echo $profile['username'];?>' readonly>
-													</td>
-													<td valign = "top"></td>
-												</tr>
-												</table>
-											</td>
-										</tr>
-										
-									<?php
-										if((int)$Config->get('allow_user_emailchange')) 
-										{ ?>
 											<tr>
-												<td align='right' valign = "top">
-													<font face="arial,helvetica" size='-1'><span><b><?php echo $lang['email'];?></b></span></font>
+												<td align='right' valign = "top" width="40%">
+													<font face="arial,helvetica" size='-1'><span><b><?php echo $lang['username'];?></b></span></font>
 												</td>
-												<td align='left'><table border='0' cellspacing='0' cellpadding='0'>
-													<tr>
-														<td>
-															<input type='text' name='email' size='30' value='<?php echo $profile['email'];?>'>
-														</td>
-														<td valign="top"></td>
-													</tr>
-												</table>
-												</td>
-											</tr>
-										<?php 
-										}
-										else
-										{ ?>
-											<tr>
-												<td align='right' valign="top"><font face="arial,helvetica" size='-1'>
-													<span><b><?php echo $lang['email'];?></b></span></font>
-												</td>
-												<td align='left'><table border='0' cellspacing='0' cellpadding='0'>
-													<tr>
-														<td>
-															<input type="text" size="30" value="&nbsp;&nbsp;<?php echo $profile['email'];?>" readonly>
-															<span></span>
-														</td>
-														<td valign = "top"></td>
-													</tr>
+												<td align='left'>
+													<table border='0' cellspacing='0' cellpadding='0'>
+														<tr>
+															<td>
+																<input type="text" name="username" size="30" disabled="disabled" value="<?= $profile['username'];?>">
+															</td>
+															<td valign="top"></td>
+														</tr>
 													</table>
 												</td>
 											</tr>
-									<?php 
-										} ?>
-										
-										<?php 
-										if((int)$Config->get('allow_user_passchange')) 
-										{ ?>
 											<tr>
 												<td align='right' valign = "top">
-													<font face="arial,helvetica" size='-1'><span><b><?php echo $lang['newpass']; ?></b></span></font>
+													<font face="arial,helvetica" size='-1'><span><b><?php echo $lang['email'];?></b></span></font>
 												</td>
 												<td align='left'>
 													<table border='0' cellspacing='0' cellpadding='0'>
 														<tr>
 															<td>
-																<input type="password" size="30" name="new_pass">
+																<input type='text' name='email' size='30' value='<?php echo $profile['email'];?>' <?php if(!(int)$Config->get('allow_user_emailchange')) echo 'disabled="disabled"';?>>
 															</td>
-															<td valign = "top"></td>
+															<td valign="top"></td>
 														</tr>
 													</table>
 												</td>
 											</tr>
-									<?php
-										}
-									?>	
-									
+								<?php 
+									if((int)$Config->get('allow_user_passchange')) 
+									{
+								?>
+										<tr>
+											<td align='right' valign = "top">
+												<font face="arial,helvetica" size='-1'><span><b><?php echo $lang['newpass']; ?></b></span></font>
+											</td>
+											<td align='left'>
+												<table border='0' cellspacing='0' cellpadding='0'>
+													<tr>
+														<td>
+															<input type="password" size="30" name="new_pass">
+														</td>
+														<td valign = "top"></td>
+													</tr>
+												</table>
+											</td>
+										</tr>
+								<?php
+									}
+								?>
 										<!-- EXPANSION -->
 										<tr>
 											<td align='right' valign = "top">
@@ -214,7 +189,6 @@
 										<br />
 										<!-- END "change your info" TABLE -->
 										<div align="center">
-											<input type="image" src="<?php echo $Template['path']; ?>/images/buttons/button-cancel.gif" size="16" class="button" style="font-size:12px;" value="<?php echo $lang['reset'];?>">
 											<input type="image" src="<?php echo $Template['path']; ?>/images/buttons/button-update.gif" class="button" style="font-size:12px;" value="<?php echo $lang['change'];?>">
 										</div>
 									</td>
@@ -223,7 +197,10 @@
 						</tr>
 					</table>
 					</form>
-					
+			<?php	
+				if((int)$Config->get('reg_secret_questions'))
+				{
+			?>
 					<br />
 					<br />
 					<?php write_subheader($lang['Other_Info']); ?>
@@ -240,12 +217,7 @@
 										// We must check to see if they are set. If so then we need to
 										// show a success message. Secret questions are NOT meant to be changed
 										// If they arent set, then show the form to set them
-										if($profile['secret_q1'] != '' || $profile['secret_q1'] != 'Disabled')
-										{
-											output_message('success', $lang['secretq_set']);
-											echo "<br />";
-										}
-										else
+										if($profile['secret_q1'] == '' || $profile['secret_q1'] == 'Disabled')
 										{
 											echo '<center><span style="color: red">'.$lang['secretq_not_set'].'</span></center><br />';
 										?>
@@ -319,29 +291,27 @@
 													<table border='0' cellspacing='0' cellpadding='0'>
 														<tr>
 															<td>
-																<input type="submit" value="Change Secret questions" class="button">
-											</form>
-															</td>
-															<td valign = "top">
-															<form method="post" action="?p=account&sub=manage&action=resetsecretq" style="{MARGIN-LEFT: 0pt; MARGIN-RIGHT: 0pt; MARGIN-TOP: 0pt; MARGIN-BOTTOM: 0pt;}">
-															<input type="hidden" name="reset_secretq" value="reset_secretq">
-															<input type="submit" value="Reset Secret questions" name="reset_secretq">
-															</form>
+																<input type="image" src="<?php echo $Template['path']; ?>/images/buttons/button-update.gif" class="button" style="font-size:12px;" value="<?php echo $lang['change'];?>">
 															</td>
 														</tr>
 													</table>
 												</td>
 											</tr>		
+											</form>
 										<!--Secret QUESTION END-->
 									<?php
-										} ?>
+										}
+									?>
 										</table>
 									</td>
 								</tr>
 								</table>
 							</td>
 						</tr>
-					</table>					
+					</table>
+			<?php
+				}
+			?>
 				</td>
 			</tr>
 		</table>