diff --git a/backend/scripts/manage.template.sh b/backend/scripts/manage.template.sh
index 31ccabffe..31f261b6b 100644
--- a/backend/scripts/manage.template.sh
+++ b/backend/scripts/manage.template.sh
@@ -16,4 +16,4 @@ if [ -f ./environ ]; then
    source ./environ
 fi
 
-exec $JAVA_CMD $JVM_OPTS -classpath $(cat classpath) -Dlog4j2.configurationFile=./log4j2.xml clojure.main -m app.cli.manage "\$@"
+exec $JAVA_CMD $JVM_OPTS -classpath $(cat classpath) -Dlog4j2.configurationFile=./log4j2.xml clojure.main -m app.cli.manage "$@"
diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj
index 8095b3133..7e719b6c2 100644
--- a/backend/src/app/rpc/mutations/profile.clj
+++ b/backend/src/app/rpc/mutations/profile.clj
@@ -135,11 +135,11 @@
   "Returns true if email's domain is in the given whitelist or if given
   whitelist is an empty string."
   [whitelist email]
-  (if (str/blank? whitelist)
+  (if (str/empty-or-nil? whitelist)
     true
     (let [domains (str/split whitelist #",\s*")
-          email-domain (second (str/split email #"@"))]
-      (contains? (set domains) email-domain))))
+          domain  (second (str/split email #"@" 2))]
+      (contains? (set domains) domain))))
 
 (def ^:private sql:profile-existence
   "select exists (select * from profile
diff --git a/frontend/shadow-cljs.edn b/frontend/shadow-cljs.edn
index 22093d0ee..ab0d85c34 100644
--- a/frontend/shadow-cljs.edn
+++ b/frontend/shadow-cljs.edn
@@ -1,6 +1,7 @@
 {:http {:port 3448}
  :nrepl {:port 3447}
  :jvm-opts ["-Xmx700m" "-Xms100m" "-XX:+UseSerialGC"]
+ :dev-http {8888 "classpath:public"}
 
  :source-paths ["src", "vendor", "resources", "../common"]