diff --git a/hsarback/conf/WEB-INF/web.xml b/hsarback/conf/WEB-INF/web.xml
index 36b08cf..d9b1781 100644
--- a/hsarback/conf/WEB-INF/web.xml
+++ b/hsarback/conf/WEB-INF/web.xml
@@ -24,27 +24,11 @@
   		<init-param>
 	  		<param-name>proxyServiceUrl</param-name>
 		  	<param-value>https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend</param-value>
-  		</init-param>
-		  <init-param>
-  			<param-name>Components</param-name>
-	  		<param-value>user,domain,member,contact,bankaccount,emailaddress,emailalias,pac,paccomponent,hive,ipaddr,basepac,basecomponent,component,q</param-value>
-		  </init-param>
-  		<init-param>
-	  		<param-name>ComponentClass_user</param-name>
-		  	<param-value>de.hsadmin.mods.user.UnixUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_user</param-name>
-		  	<param-value>Unix User</param-value>
   		</init-param>
 	  	<init-param>
-		  	<param-name>ComponentClass_domain</param-name>
-			<param-value>de.hsadmin.mods.dom.Domain</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_domain</param-name>
-		  	<param-value>Domains</param-value>
-  		</init-param>
+  			<param-name>Components</param-name>
+	  		<param-value>member,pac,user,domain,emailaddress,emailalias,mysqluser,mysqldb,postgresqluser,postgresqldb,q</param-value>
+		</init-param>
 	  	<init-param>
 		  	<param-name>ComponentClass_member</param-name>
 			<param-value>de.hsadmin.mods.cust.Customer</param-value>
@@ -53,38 +37,6 @@
 	  		<param-name>ComponentDescription_member</param-name>
 		  	<param-value>Mitglieder</param-value>
   		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_contact</param-name>
-			<param-value>de.hsadmin.mods.cust.Contact</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_contact</param-name>
-		  	<param-value>Kontaktdaten zu Mitgliedern</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_bankaccount</param-name>
-			<param-value>de.hsadmin.mods.cust.BankAccount</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_bankaccount</param-name>
-		  	<param-value>Bankverbindungen</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_emailaddress</param-name>
-			<param-value>de.hsadmin.mods.email.EMailAddress</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_emailaddress</param-name>
-		  	<param-value>e-Mail Adressen</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_emailalias</param-name>
-			<param-value>de.hsadmin.mods.email.EMailAlias</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_emailalias</param-name>
-		  	<param-value>e-Mail Aliases</param-value>
-  		</init-param>
 	  	<init-param>
 		  	<param-name>ComponentClass_pac</param-name>
 			<param-value>de.hsadmin.mods.pac.Pac</param-value>
@@ -93,53 +45,69 @@
 	  		<param-name>ComponentDescription_pac</param-name>
 		  	<param-value>Pakete</param-value>
   		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_paccomponent</param-name>
-			<param-value>de.hsadmin.mods.pac.PacComponent</param-value>
+  		<init-param>
+	  		<param-name>ComponentClass_user</param-name>
+		  	<param-value>de.hsadmin.mods.user.UnixUser</param-value>
   		</init-param>
   		<init-param>
-	  		<param-name>ComponentDescription_paccomponent</param-name>
-		  	<param-value>Optionen der Pakete</param-value>
+	  		<param-name>ComponentDescription_user</param-name>
+		  	<param-value>Benutzer und Postfaecher anlegen</param-value>
   		</init-param>
 	  	<init-param>
-		  	<param-name>ComponentClass_hive</param-name>
-			<param-value>de.hsadmin.mods.pac.Hive</param-value>
+		  	<param-name>ComponentClass_domain</param-name>
+			<param-value>de.hsadmin.mods.dom.Domain</param-value>
   		</init-param>
   		<init-param>
-	  		<param-name>ComponentDescription_hive</param-name>
-		  	<param-value>Hives</param-value>
+	  		<param-name>ComponentDescription_domain</param-name>
+		  	<param-value>Domains aufschalten</param-value>
   		</init-param>
 	  	<init-param>
-		  	<param-name>ComponentClass_ipaddr</param-name>
-			<param-value>de.hsadmin.mods.pac.INetAddress</param-value>
+		  	<param-name>ComponentClass_emailaddress</param-name>
+			<param-value>de.hsadmin.mods.email.EMailAddress</param-value>
   		</init-param>
   		<init-param>
-	  		<param-name>ComponentDescription_ipaddr</param-name>
-		  	<param-value>IP Adressen</param-value>
+	  		<param-name>ComponentDescription_emailaddress</param-name>
+		  	<param-value>E-Mail Adressen</param-value>
   		</init-param>
 	  	<init-param>
-		  	<param-name>ComponentClass_basepac</param-name>
-			<param-value>de.hsadmin.mods.pac.BasePac</param-value>
+		  	<param-name>ComponentClass_emailalias</param-name>
+			<param-value>de.hsadmin.mods.email.EMailAlias</param-value>
   		</init-param>
   		<init-param>
-	  		<param-name>ComponentDescription_basepac</param-name>
-		  	<param-value>bestellbare Pakete</param-value>
+	  		<param-name>ComponentDescription_emailalias</param-name>
+		  	<param-value>E-Mail Aliases</param-value>  
   		</init-param>
 	  	<init-param>
-		  	<param-name>ComponentClass_basecomponent</param-name>
-			<param-value>de.hsadmin.mods.pac.BaseComponent</param-value>
+		  	<param-name>ComponentClass_postgresqluser</param-name>
+			<param-value>de.hsadmin.mods.db.PgSqlUser</param-value>
   		</init-param>
   		<init-param>
-	  		<param-name>ComponentDescription_basecomponent</param-name>
-		  	<param-value>Zusammenstellung bestellbarer Pakete</param-value>
+	  		<param-name>ComponentDescription_postgresqluser</param-name>
+		  	<param-value>PostgreSQL DB-Administrator</param-value>
   		</init-param>
 	  	<init-param>
-		  	<param-name>ComponentClass_component</param-name>
-			<param-value>de.hsadmin.mods.pac.Component</param-value>
+		  	<param-name>ComponentClass_postgresqldb</param-name>
+			<param-value>de.hsadmin.mods.db.PgSqlDatabase</param-value>
   		</init-param>
   		<init-param>
-	  		<param-name>ComponentDescription_component</param-name>
-		  	<param-value>bestellbare Optionen</param-value>
+	  		<param-name>ComponentDescription_postgresqldb</param-name>
+		  	<param-value>PostgreSQL Datenbank</param-value>
+  		</init-param>
+	  	<init-param>
+		  	<param-name>ComponentClass_mysqluser</param-name>
+			<param-value>de.hsadmin.mods.db.MySqlUser</param-value>
+  		</init-param>
+  		<init-param>
+	  		<param-name>ComponentDescription_mysqluser</param-name>
+		  	<param-value>MySQL DB-Administrator</param-value>
+  		</init-param>
+	  	<init-param>
+		  	<param-name>ComponentClass_mysqldb</param-name>
+			<param-value>de.hsadmin.mods.db.MySqlDatabase</param-value>
+  		</init-param>
+  		<init-param>
+	  		<param-name>ComponentDescription_mysqldb</param-name>
+		  	<param-value>MySQL Datenbank</param-value>
   		</init-param>
 	  	<init-param>
 		  	<param-name>ComponentClass_q</param-name>
@@ -147,7 +115,7 @@
   		</init-param>
   		<init-param>
 	  		<param-name>ComponentDescription_q</param-name>
-		  	<param-value>offene Aktionen</param-value>
+		  	<param-value>Offene Aktionen</param-value>
   		</init-param>
         <load-on-startup>1</load-on-startup>
   	</servlet>
@@ -219,6 +187,30 @@
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
+    <resource-ref>
+        <res-ref-name>jms/hsadminSystem-h06</res-ref-name>
+        <res-type>javax.jms.Queue</res-type>
+        <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+    <resource-ref>
+        <res-ref-name>jms/hsadminSystem-h07</res-ref-name>
+        <res-type>javax.jms.Queue</res-type>
+        <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+    <resource-ref>
+        <res-ref-name>jms/hsadminSystem-h08</res-ref-name>
+        <res-type>javax.jms.Queue</res-type>
+        <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+    <resource-ref>
+        <res-ref-name>jms/hsadminSystem-h09</res-ref-name>
+        <res-type>javax.jms.Queue</res-type>
+        <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
     <resource-ref>
         <res-ref-name>jms/hsadminSystem-h50</res-ref-name>
         <res-type>javax.jms.Queue</res-type>
@@ -250,7 +242,25 @@
         <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
     <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h90</res-ref-name>
+        <res-ref-name>jms/hsadminSystem-h55</res-ref-name>
+        <res-type>javax.jms.Queue</res-type>
+        <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+    <resource-ref>
+        <res-ref-name>jms/hsadminSystem-h56</res-ref-name>
+        <res-type>javax.jms.Queue</res-type>
+        <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+    <resource-ref>
+        <res-ref-name>jms/hsadminSystem-h57</res-ref-name>
+        <res-type>javax.jms.Queue</res-type>
+        <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+    <resource-ref>
+        <res-ref-name>jms/hsadminSystem-h58</res-ref-name>
         <res-type>javax.jms.Queue</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAddress.java b/hsarback/src/de/hsadmin/mods/email/EMailAddress.java
index 03bdeb9..5c3cd0c 100644
--- a/hsarback/src/de/hsadmin/mods/email/EMailAddress.java
+++ b/hsarback/src/de/hsadmin/mods/email/EMailAddress.java
@@ -77,8 +77,8 @@ public class EMailAddress extends AbstractEntity implements Serializable {
 		}
 		String[] doms = parts[1].split("\\.");
 		StringBuilder query = new StringBuilder("obj.localpart='" + parts[0]
-				+ "' AND ( ( (obj.subdomain IS NULL OR obj.subdomain='') AND obj.domain.name='" + parts[1]
-				+ "' )");
+				+ "' AND ( ( (obj.subdomain IS NULL OR obj.subdomain='') AND obj.domain.name='" 
+				+ parts[1] + "' )");
 		for (int subdomLevel = 1; subdomLevel < doms.length - 1; ++subdomLevel) {
 			String subdom = "";
 			for (int n = 0; n < subdomLevel; ++n)