diff --git a/emailadmin/inc/class.uiuserdata.inc.php b/emailadmin/inc/class.uiuserdata.inc.php
index f609bd51d2..a0a592851e 100644
--- a/emailadmin/inc/class.uiuserdata.inc.php
+++ b/emailadmin/inc/class.uiuserdata.inc.php
@@ -42,7 +42,7 @@ class uiuserdata
 
 	function display_app_header()
 	{
-		$GLOBALS['egw']->js->validate_file('jscode','editUserdata','emailadmin');
+		$GLOBALS['egw']->js->validate_file('.','app','emailadmin');
 		$GLOBALS['egw_info']['flags']['include_xajax'] = True;
 
 		$GLOBALS['egw']->common->egw_header();
@@ -98,8 +98,8 @@ class uiuserdata
 			$this->t->set_var('selectbox_mailAlternateAddress', html::select(
 				'mailAlternateAddress',
 				'',
-				$addresses, 
-				true, 
+				$addresses,
+				true,
 				"style='width: 100%;' id='mailAlternateAddress'",
 				5)
 			);
@@ -111,8 +111,8 @@ class uiuserdata
 			$this->t->set_var('selectbox_mailRoutingAddress', html::select(
 				'mailForwardingAddress',
 				'',
-				$addresses, 
-				true, 
+				$addresses,
+				true,
 				"style='width: 100%;' id='mailRoutingAddress'",
 				5)
 			);
@@ -144,8 +144,8 @@ class uiuserdata
 			$this->t->set_var('selectbox_mailAlternateAddress', html::select(
 				'mailAlternateAddress',
 				'',
-				array(), 
-				true, 
+				array(),
+				true,
 				"style='width: 100%;' id='mailAlternateAddress'",
 				5)
 			);
@@ -153,8 +153,8 @@ class uiuserdata
 			$this->t->set_var('selectbox_mailRoutingAddress', html::select(
 				'mailForwardingAddress',
 				'',
-				array(), 
-				true, 
+				array(),
+				true,
 				"style='width: 100%;' id='mailRoutingAddress'",
 				5)
 			);
@@ -187,7 +187,7 @@ class uiuserdata
 			'quotaLimit'			=> $_POST["quotaLimit"],
 			'qmailDotMode'			=> $_POST["qmailDotMode"],
 			'deliveryProgramPath'		=> $_POST["deliveryProgramPath"],
-			'accountStatus'			=> $accountStatus, 
+			'accountStatus'			=> $accountStatus,
 			'deliveryMode'			=> $deliveryMode
 		);
 
diff --git a/emailadmin/js/app.js b/emailadmin/js/app.js
index 1505e4fbfa..d4cc3249b2 100644
--- a/emailadmin/js/app.js
+++ b/emailadmin/js/app.js
@@ -21,3 +21,63 @@ function disableGroupSelector()
 		document.getElementById('exec[ea_group]').disabled = false;
 	}
 }
+
+function addRow(_selectBoxName, _prompt) {
+	result = prompt(_prompt, '');
+
+	if((result == '') || (result == null)) {
+		return false;
+	}
+	
+	var newOption = new Option(result, result);
+	
+	selectBox = document.getElementById(_selectBoxName);
+	var length      = selectBox.length;
+	
+	selectBox.options[length] = newOption;
+	selectBox.selectedIndex = length;
+}
+
+function editRow(_selectBoxName, _prompt) {
+	selectBox = document.getElementById(_selectBoxName);
+	
+	selectedItem = selectBox.selectedIndex;
+
+	if(selectedItem != null && selectedItem != -1) {
+		value = selectBox.options[selectedItem].text;
+		result = prompt(_prompt, value);
+		
+		if((result == '') || (result == null)) {
+			return false;
+		}
+		
+		var newOption = new Option(result, result);
+		
+		selectBox.options[selectedItem] = newOption;
+		selectBox.selectedIndex = selectedItem;
+	}
+}
+
+function removeRow(_selectBoxName) {
+	selectBox = document.getElementById(_selectBoxName);
+	
+	selectedItem = selectBox.selectedIndex;
+	if(selectedItem != null) {
+		selectBox.options[selectedItem] = null;
+	}
+	selectedItem--;
+	if(selectedItem >= 0) {
+		selectBox.selectedIndex = selectedItem;
+	} else if (selectBox.length > 0) {
+		selectBox.selectedIndex = 0;
+	}
+}
+
+function selectAllOptions(_selectBoxName) {
+	selectBox = document.getElementById(_selectBoxName);
+
+	for(var i=0;i<selectBox.length;i++) {
+		selectBox[i].selected=true;
+	}
+
+}