diff --git a/webgui/ajax.php b/webgui/ajax.php
index 32e0f93ec381ee41dc3017e3340c7f7e2429bd96..564c6acd7cc97b17b372ef174bcee2566f708d83 100644
--- a/webgui/ajax.php
+++ b/webgui/ajax.php
@@ -793,7 +793,6 @@
 			$res->setID('ID');
 			$res->addField('ID','int');
 			$res->addField('Username','string');
-			$res->addField('Password','string');
 			$res->addField('Disabled','boolean');
 			$res->parseHash($rawData);
 
diff --git a/webgui/include/ajax/functions/AdminUsers.php b/webgui/include/ajax/functions/AdminUsers.php
index a70323fb75615be2316ec0b9ed87055759089b91..43b3dc5187de796864a7ad6998cd9a5b03e31d42 100644
--- a/webgui/include/ajax/functions/AdminUsers.php
+++ b/webgui/include/ajax/functions/AdminUsers.php
@@ -56,17 +56,6 @@ function getAdminUser($params) {
 	$resultArray['Username'] = $row->username;
 	$resultArray['Disabled'] = $row->disabled;
 
-	$res = DBSelect("SELECT Value FROM user_attributes WHERE Name = ? AND UserID = ?",
-			array('User-Password',$params[0])
-	);
-	if (!is_object($res)) {
-		return $res;
-	}
-
-	$row = $res->fetchObject();
-
-	$resultArray['Password'] = $row->value;
-
 	return $resultArray;
 }
 
@@ -89,7 +78,7 @@ function removeAdminUser($params) {
 	if ($res !== FALSE) {
 		$res = DBDo("DELETE FROM users_to_groups WHERE UserID = ?",array($params[0]));
 	}
-
+	
 	# Delete user
 	if ($res !== FALSE) {
 		$res = DBDo("DELETE FROM users WHERE ID = ?",array($params[0]));
@@ -111,27 +100,9 @@ function removeAdminUser($params) {
 function createAdminUser($params) {
 	global $db;
 
-	DBBegin();
 	$res = DBDo("INSERT INTO users (Username) VALUES (?)",array($params[0]['Username']));
-
-	if ($res !== FALSE) {
-		$lastInsertID = DBLastInsertID();
-		if (isset($lastInsertID)) {
-			$res = DBDo("INSERT INTO user_attributes (UserID,Name,Operator,Value) VALUES (?,?,?,?)",
-					array($lastInsertID,'User-Password','==',$params[0]['Password'])
-			);
-		} else {
-			$res = 0;
-		}
-	}
-
-	# Commit and return if successful
-	if ($res !== FALSE) {
-		DBCommit();
+	if (!is_numeric($res)) {
 		return $res;
-	# Else rollback database
-	} else {
-		DBRollback();
 	}
 
 	return NULL;
@@ -141,22 +112,9 @@ function createAdminUser($params) {
 function updateAdminUser($params) {
 	global $db;
 
-	DBBegin();
 	$res = DBDo("UPDATE users SET Username = ? WHERE ID = ?",array($params[0]['Username'],$params[0]['ID']));
-
-	if ($res !== FALSE) {
-		$res = DBDo("UPDATE user_attributes SET Value = ? WHERE Name = ? AND UserID = ?",
-				array($params[0]['Password'],'User-Password',$params[0]['ID'])
-		);
-	}
-
-	# Commit and return if successful
-	if ($res !== FALSE) {
-		DBCommit();
+	if (!is_numeric($res)) {
 		return $res;
-	# Else rollback database
-	} else {
-		DBRollback();
 	}
 
 	return NULL;
diff --git a/webgui/js/app/windows/AdminUsers.js b/webgui/js/app/windows/AdminUsers.js
index 4991665187c662988d1d9510bc8c52a252961ad6..97270a8924f1ab5602b4a0355d8ab228ebe03fba 100644
--- a/webgui/js/app/windows/AdminUsers.js
+++ b/webgui/js/app/windows/AdminUsers.js
@@ -252,9 +252,7 @@ function showAdminUserAddEditWindow(id) {
 			SOAPFunction: 'updateAdminUser',
 			SOAPParams: 
 				'0:ID,'+
-				'0:Username,'+
-				'0:Password'
-
+				'0:Username'
 		};
 
 	// We doing an Add
@@ -262,8 +260,7 @@ function showAdminUserAddEditWindow(id) {
 		submitAjaxConfig = {
 			SOAPFunction: 'createAdminUser',
 			SOAPParams: 
-				'0:Username,'+
-				'0:Password'
+				'0:Username'
 		};
 	}
 
@@ -274,10 +271,10 @@ function showAdminUserAddEditWindow(id) {
 			title: "User Information",
 
 			width: 310,
-			height: 142,
+			height: 113,
 
 			minWidth: 310,
-			minHeight: 142
+			minHeight: 113
 		},
 		// Form panel config
 		{
@@ -296,11 +293,6 @@ function showAdminUserAddEditWindow(id) {
 					maskRe: usernamePartRe,
 					allowBlank: false,
 				},
-				{
-					fieldLabel: 'Password',
-					name: 'Password',
-					allowBlank: false,
-				},
 			],
 		},
 		// Submit button config