diff --git a/pom.xml b/pom.xml
index f236b01..f9c236b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
         <module>persistence</module>
         <module>services</module>
         <module>xmlrpc</module>
+        <module>web</module>
     </modules>
 
     <build>
diff --git a/web/pom.xml b/web/pom.xml
index ca5ff23..eac4c67 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -2,11 +2,15 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>net.hostsharing</groupId>
-	<artifactId>hs.hsadmin.web</artifactId>
+	<parent>
+		<groupId>de.hsadmin</groupId>
+		<artifactId>hsadmin-parent</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>admin-web</artifactId>
 	<packaging>war</packaging>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>hs.hsadmin.web</name>
+	<name>HSAdmin Webapp</name>
 
 	<dependencies>
 
diff --git a/web/src/main/java/de/hsadmin/web/EMailTargetEditor.java b/web/src/main/java/de/hsadmin/web/EMailTargetEditor.java
index ee73347..150fad9 100644
--- a/web/src/main/java/de/hsadmin/web/EMailTargetEditor.java
+++ b/web/src/main/java/de/hsadmin/web/EMailTargetEditor.java
@@ -90,10 +90,16 @@ public class EMailTargetEditor extends CustomComponent implements IHSEditor, Val
 			if (child instanceof AbstractOrderedLayout) {
 				final Component grandChild = ((AbstractOrderedLayout) child).getComponent(1);
 				if (grandChild instanceof TextField) {
-					targetsList.add(((TextField) grandChild).getValue()); 
+					final String value = ((TextField) grandChild).getValue();
+					if (value != null && !value.isEmpty()) {
+						targetsList.add(value); 
+					}
 				}
 				if (grandChild instanceof NativeSelect) {
-					targetsList.add(((NativeSelect) grandChild).getValue().toString()); 
+					final Object value = ((NativeSelect) grandChild).getValue();
+					if (value != null) {
+						targetsList.add(value.toString()); 
+					}
 				}
 			}
 		}
@@ -166,9 +172,12 @@ public class EMailTargetEditor extends CustomComponent implements IHSEditor, Val
 			setWidth("100%");
 			setSpacing(true);
 			final NativeSelect targetTypeSelect = new NativeSelect();
-			targetTypeSelect.addItems(new Object[] { I18N.getText("emailtarget.email"), I18N.getText("emailtarget.postbox"), I18N.getText("emailtarget.alias") });
+			targetTypeSelect.setMultiSelect(false);
+			targetTypeSelect.setNullSelectionAllowed(true);
+			targetTypeSelect.setNullSelectionItemId(" ");
+			targetTypeSelect.addItems(new Object[] { " ", I18N.getText("emailtarget.email"), I18N.getText("emailtarget.postbox"), I18N.getText("emailtarget.alias") });
+			targetTypeSelect.setValue(" ");
 			targetTypeSelect.setWidth("6.0em");
-			targetTypeSelect.setValue("");
 			addComponent(targetTypeSelect);
 			setComponentAlignment(targetTypeSelect, Alignment.MIDDLE_LEFT);
 			setExpandRatio(targetTypeSelect, 0.0f);