diff --git a/src/Entities/AccountAvailability.ts b/src/Entities/AccountAvailability.ts
index bacf107b..1661c2b2 100755
--- a/src/Entities/AccountAvailability.ts
+++ b/src/Entities/AccountAvailability.ts
@@ -22,13 +22,13 @@ export class AccountAvailability {
   public static CONNECTIONS: string = 'connections';     // available to connections
   public static ALL: string = 'all';          // available to all
 
-  // See if the passed role code is a known role token
-  static KnownAvailability(pAvailabilit: string): boolean {
+  // See if the passed availability code is a known availability token
+  static KnownAvailability(pAvailability: string): boolean {
     return [ AccountAvailability.NONE,
             AccountAvailability.FRIENDS,
             AccountAvailability.CONNECTIONS,
             AccountAvailability.ALL
-           ].includes(pAvailabilit);
+           ].includes(pAvailability);
   };
 
 };
diff --git a/src/Entities/AccountEntity.ts b/src/Entities/AccountEntity.ts
index 895acf2b..7603c725 100755
--- a/src/Entities/AccountEntity.ts
+++ b/src/Entities/AccountEntity.ts
@@ -69,12 +69,6 @@ export class AccountEntity implements Entity {
   public timeOfLastHeartbeat: Date; // when we last heard from this user
 };
 
-// Helper function that checks to make sure 'availability' is the right value.
-// Returns 'true' if availability is legal
-export function checkAvailability(pAvailability: string): boolean {
-  return ['none', 'all', 'friends', 'connections'].includes(pAvailability.toLowerCase());
-};
-
 // Get the value of a domain field with the fieldname.
 // Checks to make sure the getter has permission to get the values.
 // Returns the value. Could be 'undefined' whether the requestor doesn't have permissions or that's
diff --git a/src/route-tools/Permissions.ts b/src/route-tools/Permissions.ts
index 223c42e0..796f1194 100755
--- a/src/route-tools/Permissions.ts
+++ b/src/route-tools/Permissions.ts
@@ -15,7 +15,7 @@
 'use strict';
 
 import { Entity } from '@Entities/Entity';
-import { AccountEntity, checkAvailability } from '@Entities/AccountEntity';
+import { AccountEntity } from '@Entities/AccountEntity';
 import { DomainEntity } from '@Entities/DomainEntity';
 import { AuthToken } from '@Entities/AuthToken';
 import { Tokens, TokenScope } from '@Entities/Tokens';
diff --git a/src/route-tools/Util.ts b/src/route-tools/Util.ts
index 2316079b..e67834ed 100755
--- a/src/route-tools/Util.ts
+++ b/src/route-tools/Util.ts
@@ -17,7 +17,7 @@
 import { Request } from 'express';
 
 import { Accounts } from '@Entities/Accounts';
-import { checkAvailability, AccountEntity, setAccountField } from '@Entities/AccountEntity';
+import { AccountEntity, setAccountField } from '@Entities/AccountEntity';
 
 import { Domains } from '@Entities/Domains';
 import { DomainEntity } from '@Entities/DomainEntity';
diff --git a/src/routes/api/v1/domains.ts b/src/routes/api/v1/domains.ts
index 9a8b14d7..459f852c 100755
--- a/src/routes/api/v1/domains.ts
+++ b/src/routes/api/v1/domains.ts
@@ -64,7 +64,7 @@ const procPostDomains: RequestHandler = async (req: Request, resp: Response, nex
     if (req.body && req.body.domain && req.body.domain.label) {
       const newDomainName = req.body.domain.label;
       if (IsNotNullOrEmpty(newDomainName)) {
-        if (await domainFields.name.validate(domainFields.name, 'name', newDomainName)) {
+        if (await domainFields.name.validate(domainFields.name, req.vAuthAccount, newDomainName)) {
           const generatedAPIkey: string = GenUUID();
 
           const newDomain = Domains.createDomain();
@@ -105,7 +105,7 @@ const procPostDomains: RequestHandler = async (req: Request, resp: Response, nex
           req.vRestResp.addAdditionalField('domain', domainInfo);
         }
         else {
-          req.vRestResp.respondFailure('name contains not allowed characters');
+          req.vRestResp.respondFailure('domain name can only contain the characters a-zA-Z0-9+-_.');
         };
       }
       else {