diff --git a/src/commands/cwg_selfserv.ts b/src/commands/cwg_selfserv.ts
index 123cad3..91ea39b 100644
--- a/src/commands/cwg_selfserv.ts
+++ b/src/commands/cwg_selfserv.ts
@@ -20,7 +20,6 @@ export default class CWG_SelfService extends Command {
   }
 
   public async run(message: Message, args: string[]) {
-    console.log(args);
     const reqDomain = `${escape(args[0])}.cloud.libraryofcode.org`;
 
     try {
@@ -114,8 +113,7 @@ export default class CWG_SelfService extends Command {
   }
 
   public domainTextValidation(domain: string) {
-    if (/[^\w\s-]/.test(domain.trim().toLowerCase())) return false;
-    return true;
+    return /[A-Za-z0-9](?:[A-Za-z0-9-]{0,19}[A-Za-z0-9])?/.test(domain);
   }
 
   public async checkAuthorizationToken(userID: string, token: string) {