diff --git a/net/server/internal/api_getAccountUsername.go b/net/server/internal/api_getAccountUsername.go
index fa021f0a..c1a2d9e6 100644
--- a/net/server/internal/api_getAccountUsername.go
+++ b/net/server/internal/api_getAccountUsername.go
@@ -15,7 +15,13 @@ type accountUsername struct {
 //GetAccountUsername determines if username is assignable
 func GetAccountUsername(w http.ResponseWriter, r *http.Request) {
 
-	if r.FormValue("token") != "" {
+  if r.FormValue("agent") != "" {
+    _, code, res := ParamAgentToken(r, false)
+    if res != nil {
+      ErrResponse(w, code, res)
+      return
+    }
+  } else if r.FormValue("token") != "" {
 		token, _, res := AccessToken(r)
 		if res != nil || token.TokenType != APPTokenCreate {
       time.Sleep(APPUsernameWait * time.Second);