diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java b/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
index 55618b4..e953e4a 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
+++ b/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
@@ -186,7 +186,7 @@ public class DomainModuleImpl extends AbstractModuleImpl {
 			dom.setDomainoptions(domainOptions);
 		}
 		if (dom.getValidsubdomainnames() == null) {
-			dom.setValidsubdomainnames("www");
+			dom.setValidsubdomainnames("*");
 		}
 		final AbstractEntity newDomain = super.add(dom);
 		final GenericModuleImpl helperModule = new GenericModuleImpl(getTransaction());
@@ -233,9 +233,6 @@ public class DomainModuleImpl extends AbstractModuleImpl {
 			}
 		}
 		for (DomainOption opt : domainOptions) {
-			if ("letsencrypt".equals(opt.getName()) && updatedDom.getServeraliases().contains("*")) {
-				throw new HSAdminException("invalid domain option: " + opt.getName() + " for wildcard subdomain");
-			}
 			if ("backupmxforexternalmx".equals(opt.getName())) {
 				final Query query = em.createQuery(
 						"SELECT e FROM " + EMailAddress.class.getAnnotation(javax.persistence.Entity.class).name()