diff --git a/webgui/include/ajax/functions/WiSPUsers.php b/webgui/include/ajax/functions/WiSPUsers.php
index 7eae446fcd23c9993ae142b8428f3db2d278fb88..51d5bec85db37e3e05aedaa777ebe8dbf20e5486 100644
--- a/webgui/include/ajax/functions/WiSPUsers.php
+++ b/webgui/include/ajax/functions/WiSPUsers.php
@@ -521,18 +521,22 @@ function updateWiSPUser($params) {
 					FirstName = ?,
 					LastName = ?,
 					Phone = ?,
-					Email = ?,
-					LocationID = ?
+					Email = ?
 				WHERE
 					UserID = ?",
 				array($params[0]['Firstname'],
 				$params[0]['Lastname'],
 				$params[0]['Phone'],
 				$params[0]['Email'],
-				$params[0]['LocationID'],
 				$params[0]['ID'])
 		);
 	}
+	# If successful, add location if any
+	if ($res !== FALSE && !empty($params[0]['LocationID'])) {
+		$res = DBDo("UPDATE wisp_userdata SET LocationID = ? WHERE UserID = ?",
+				array($params[0]['LocationID'],$params[0]['ID'])
+		);
+	}
 
 	# Commit changes if all was successful, else break
 	if ($res !== FALSE) {