diff --git a/setup/start.sh b/setup/start.sh
index 7abf468f6..5fcbd271d 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -193,7 +193,7 @@ fi
 echo "Add webadmin api cient"
 readonly ADMIN_SCOPES="cloudron,developer,profile,users,apps,settings"
 mysql -u root -p${mysql_root_password} \
-    -e "REPLACE INTO clients (id, appId, type, clientSecret, redirectURI, scope) VALUES (\"cid-webadmin\", \"webadmin\", \"admin\", \"secret-webadmin\", \"${admin_origin}\", \"${ADMIN_SCOPES}\")" box
+    -e "REPLACE INTO clients (id, appId, type, clientSecret, redirectURI, scope) VALUES (\"cid-webadmin\", \"Settings\", \"admin\", \"secret-webadmin\", \"${admin_origin}\", \"${ADMIN_SCOPES}\")" box
 
 echo "Add SDK api client"
 mysql -u root -p${mysql_root_password} \
@@ -201,7 +201,7 @@ mysql -u root -p${mysql_root_password} \
 
 echo "Add cli api client"
 mysql -u root -p${mysql_root_password} \
-    -e "REPLACE INTO clients (id, appId, type, clientSecret, redirectURI, scope) VALUES (\"cid-cli\", \"Cloudron cli tool\", \"cli\", \"secret-cli\", \"${admin_origin}\", \"*,roleSdk\")" box
+    -e "REPLACE INTO clients (id, appId, type, clientSecret, redirectURI, scope) VALUES (\"cid-cli\", \"Cloudron Tool\", \"cli\", \"secret-cli\", \"${admin_origin}\", \"*,roleSdk\")" box
 
 set_progress "80" "Starting Cloudron"
 systemctl start cloudron.target
diff --git a/src/clients.js b/src/clients.js
index 7cb8d6d4f..0fac0c2db 100644
--- a/src/clients.js
+++ b/src/clients.js
@@ -157,8 +157,8 @@ function getAll(callback) {
 
         var tmp = [];
         async.each(results, function (record, callback) {
-            if (record.type === exports.TYPE_ADMIN) {
-                record.name = constants.ADMIN_NAME;
+            if (record.type === exports.TYPE_ADMIN || record.type === exports.TYPE_SDK || record.type === exports.TYPE_CLI) {
+                record.name = record.appid;
                 record.location = constants.ADMIN_LOCATION;
 
                 tmp.push(record);