diff --git a/application/controllers/user.php b/application/controllers/user.php
index 0bbaa52d..93e1d631 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -190,6 +190,18 @@ class User extends CI_Controller {
 				$data['user_timezone'] = $q->user_timezone;
 			}
 
+			if($this->input->post('user_lotw_name')) {
+				$data['user_lotw_name'] = $this->input->post('user_lotw_name');
+			} else {
+				$data['user_lotw_name'] = $q->user_lotw_name;
+			}
+			
+			if($this->input->post('user_lotw_password')) {
+				$data['user_lotw_password'] = $this->input->post('user_lotw_password');
+			} else {
+				$data['user_lotw_password'] = $q->user_lotw_password;
+			}
+			
 			$this->load->view('user/edit', $data);
 			$this->load->view('layout/footer');
 		}
diff --git a/application/models/user_model.php b/application/models/user_model.php
index c782fa62..0250ae4e 100644
--- a/application/models/user_model.php
+++ b/application/models/user_model.php
@@ -121,7 +121,9 @@ class User_Model extends CI_Model {
 					'user_locator' => $fields['user_locator'],
 					'user_firstname' => $fields['user_firstname'],
 					'user_lastname' => $fields['user_lastname'],
-					'user_timezone' => $fields['user_timezone']
+					'user_timezone' => $fields['user_timezone'],
+					'user_lotw_name' => $fields['user_lotw_name'],
+					'user_lotw_password' => $fields['user_lotw_password']
 				);
 	
 				// Check to see if the user is allowed to change user levels