diff --git a/src/APIServers.cpp b/src/APIServers.cpp
index fa982e1..384f69a 100644
--- a/src/APIServers.cpp
+++ b/src/APIServers.cpp
@@ -52,6 +52,7 @@ namespace OpenWifi {
             RESTAPI_sms_handler,
             RESTAPI_suboauth2_handler,
             RESTAPI_subuser_handler,
+            RESTAPI_suboauth2_handler,
             RESTAPI_subusers_handler
         >(Path, Bindings, L, S);
     }
diff --git a/test_scripts/curl/cli b/test_scripts/curl/cli
index bbb7a28..6182460 100755
--- a/test_scripts/curl/cli
+++ b/test_scripts/curl/cli
@@ -35,7 +35,7 @@ fi
 token=""
 result_file=result.json
 username="script.runner@arilia.com"
-password="NoMoreN00bs!"
+password="NoMoreN00bs#"
 browser_list=(firefox sensible-browser xdg-open w3m links links2 lynx youtube-dl)
 browser=""
 
@@ -175,6 +175,15 @@ createuser() {
     jq < ${result_file}
 }
 
+createsub() {
+    payload="{ \"id\": \"0\", \"email\" : \"$1\", \"currentPassword\" : \"$2\", \"changePassword\" : false, \"userRole\" : \"subscriber\" }"
+            curl  ${FLAGS} -X POST "https://${OWSEC}/api/v1/subuser/0" \
+            -H "accept: application/json" \
+            -H "Authorization: Bearer ${token}" \
+            -d "$payload"  > ${result_file}
+            jq < ${result_file}
+}
+
 createuser_v() {
     payload="{ \"id\": \"0\", \"email\" : \"$1\", \"currentPassword\" : \"$2\", \"changePassword\" : true}"
     curl  ${FLAGS} -X POST "https://${OWSEC}/api/v1/user/0?email_verification=true" \
@@ -192,6 +201,14 @@ deleteuser() {
     jq < ${result_file}
 }
 
+deletesub() {
+    curl  ${FLAGS} -X DELETE "https://${OWSEC}/api/v1/subuser/$1" \
+    -H "accept: application/json" \
+    -H "Authorization: Bearer ${token}" \
+    -d "$payload"  > ${result_file}
+    jq < ${result_file}
+}
+
 getuser() {
     curl  ${FLAGS} -X GET "https://${OWSEC}/api/v1/user/$1" \
     -H "accept: application/json" \
@@ -200,6 +217,14 @@ getuser() {
     jq < ${result_file}
 }
 
+getsub() {
+    curl  ${FLAGS} -X GET "https://${OWSEC}/api/v1/subuser/$1" \
+    -H "accept: application/json" \
+    -H "Authorization: Bearer ${token}" \
+    -d "$payload"  > ${result_file}
+    jq < ${result_file}
+}
+
 getuserbyemail() {
     curl  ${FLAGS} -X GET "https://${OWSEC}/api/v1/user/${1}?byEmail=true" \
     -H "accept: application/json" \
@@ -208,6 +233,14 @@ getuserbyemail() {
     jq < ${result_file}
 }
 
+getsubbyemail() {
+    curl  ${FLAGS} -X GET "https://${OWSEC}/api/v1/subuser/${1}?byEmail=true" \
+    -H "accept: application/json" \
+    -H "Authorization: Bearer ${token}" \
+    -d "$payload"  > ${result_file}
+    jq < ${result_file}
+}
+
 listusers() {
     curl  ${FLAGS} -X GET "https://${OWSEC}/api/v1/users" \
     -H "accept: application/json" \
@@ -216,6 +249,14 @@ listusers() {
     jq < ${result_file}
 }
 
+listsubs() {
+    curl  ${FLAGS} -X GET "https://${OWSEC}/api/v1/subusers" \
+    -H "accept: application/json" \
+    -H "Authorization: Bearer ${token}" \
+    -d "$payload"  > ${result_file}
+    jq < ${result_file}
+}
+
 policies() {
     payload="{}"
     curl ${FLAGS} -X POST "https://${OWSEC}/api/v1/oauth2?requirements=true" \
@@ -367,11 +408,17 @@ shopt -s nocasematch
 
 case "$1" in
     "createuser") login; createuser "$2" "$3"; logout;;
+    "createsub") login; createsub "$2" "$3"; logout;;
     "createuser_v") login; createuser_v "$2" "$3"; logout;;
+    "createsub_v") login; createsub_v "$2" "$3"; logout;;
     "deleteuser") login; deleteuser "$2" ; logout;;
+    "deletesub") login; deletesub "$2" ; logout;;
     "getuser") login; getuser "$2" ; logout;;
+    "getsub") login; getsub "$2" ; logout;;
     "getuserbyemail") login; getuserbyemail "$2" ; logout;;
+    "getsubbyemail") login; getsubbyemail "$2" ; logout;;
     "listusers") login; listusers ; logout ;;
+    "listsubs") login; listsubs ; logout ;;
     "me") login; me ; logout ;;
     "listendpoints") login; listendpoints ; logout ;;
     "testlogin") testlogin "$2" "$3" "$4";;