diff --git a/bubble-server/src/main/java/bubble/model/cloud/BubbleDomain.java b/bubble-server/src/main/java/bubble/model/cloud/BubbleDomain.java
index a377f252..be286179 100644
--- a/bubble-server/src/main/java/bubble/model/cloud/BubbleDomain.java
+++ b/bubble-server/src/main/java/bubble/model/cloud/BubbleDomain.java
@@ -150,7 +150,7 @@ public class BubbleDomain extends IdentifiableBase implements AccountTemplate {
         }
         final String prefix = fqdn.substring(0, fqdn.length() - ("." + getName()).length());
         final int dotCount = countMatches(prefix, '.');
-        if (dotCount != -1) {
+        if (dotCount != 1) {
             errors.addViolation("err.fqdn.invalid");
             return null;
         }
diff --git a/bubble-web b/bubble-web
index 2eef2590..66140fa3 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit 2eef2590acebd2db5b27290a98b0adfd6ebb9ee2
+Subproject commit 66140fa3ec92ef8b6418eb925d003b5730b113d2