diff --git a/application/controllers/auth.php b/application/controllers/auth.php
index e8bd34a..fce9b7c 100644
--- a/application/controllers/auth.php
+++ b/application/controllers/auth.php
@@ -113,10 +113,9 @@ class Auth extends CI_Controller {
 			if ($this->input->post('new_password') != '') {
 				$username = $this->session->userdata('username');
 				$change = $this->access->changePassword($username, $this->input->post('old_password'), $this->input->post('new_password'));
-
-				if ($change) {
-					$this->logout();
-				}
+// 				if ($change) {
+// 					$this->logout();
+// 				}
 			}
 
 			// update users table
diff --git a/application/views/auth/settings.php b/application/views/auth/settings.php
index 4195485..dcfb390 100644
--- a/application/views/auth/settings.php
+++ b/application/views/auth/settings.php
@@ -6,8 +6,9 @@
 			<h2><?=_('Settings');?></h2>
 		</div>
 		<ul class="tabs">
-			<li class="active"><a href="#personal"><?=_('Personal Information');?></a></li>
+			<li class="active"><a href="#personal"><?=_('Personal information');?></a></li>
 			<li><a href="#settings"><?=_('Settings');?></a></li>
+			<li><a href="#password"><?=_('Password');?></a></li>
 		</ul>
 
 		<div class="tab_container">
@@ -15,6 +16,7 @@
 				<ul>
 					<li>
 						<?=form_label(_('First name'), 'firstname');?>
+						<span class="req">*</span>
 						<div>
 							<input type="text" name="firstname" id="firstname" class="short text" value="<?=set_value('firstname', $firstname);?>" />
 							<?=form_error('firstname');?>
@@ -22,6 +24,7 @@
 					</li>
 					<li>
 						<?=form_label(_('Last name'), 'lastname');?>
+						<span class="req">*</span>
 						<div>
 							<input type="text" name="lastname" id="lastname" class="short text" value="<?=set_value('lastname', $lastname);?>" />
 							<?=form_error('lastname');?>
@@ -29,6 +32,7 @@
 					</li>
 					<li>
 						<?=form_label(_('Email address'), 'email');?>
+						<span class="req">*</span>
 						<div>
 							<input type="text" name="email" id="email" class="medium text" value="<?=set_value('email', $email);?>" />
 							<?=form_error('email');?>
@@ -59,9 +63,34 @@
 					</li>
 				</ul>
 			</div>
+			<div id="password" class="tab_content">
+				<ul>
+					<li>
+						<?=form_label(_('Current password'), 'old_password');?>
+						<div>
+							<input type="password" name="old_password" id="old_password" class="short text" value="<?=set_value('old_password');?>" />
+							<?=form_error('old_password');?>
+						</div>
+					</li>
+					<li>
+						<?=form_label(_('New password'), 'new_password');?>
+						<div>
+							<input type="password" name="new_password" id="new_password" class="short text" />
+							<?=form_error('new_password');?>
+						</div>
+					</li>
+					<li>
+						<?=form_label(_('Confirm new password'), 'new_password_confirm');?>
+						<div>
+							<input type="password" name="new_password_confirm" id="new_password_confirm" class="short text" />
+							<?=form_error('new_password_confirm');?>
+						</div>
+					</li>
+				</ul>
+			</div>
 			<div class="tab_buttons">
 				<p>
-					<a class="button save" href="javascript:void(0);" onclick="$('form[name=settings]').submit();"><?=_('Save');?></a>
+					<a class="button save" href="javascript:void(0);" onclick="$('form[name=settings]').submit();"><?=_('Save settings');?></a>
 				</p>
 			</div>
 		</div>