diff --git a/salt/manager/tools/sbin/so-client b/salt/manager/tools/sbin/so-client
index 4177e84b0..944214dd5 100755
--- a/salt/manager/tools/sbin/so-client
+++ b/salt/manager/tools/sbin/so-client
@@ -42,6 +42,12 @@ function usage() {
             Required parameters: 
               --id <id>
               --role <role>
+
+    update: Updates a client name and note.
+            Required parameters:
+              --id <id>
+              --name <name>
+              --note <note>
   
   generate-secret: Regenerates a client's secret and outputs the new secret. 
             Required parameters: 
@@ -240,6 +246,36 @@ EOF
   addClientRole "$id" "$role"
 }
 
+function update() {
+  clientId=$1
+  name=$2
+  note=$3
+  
+  body=$(cat <<EOF
+[
+    {
+        "op": "replace",
+        "path": "/client_name",
+        "value": "$name"
+    },
+    {
+        "op": "replace",
+        "path": "/metadata",
+        "value": {
+          "note": "$note"
+        }
+    }
+]
+EOF
+  )
+  
+  response=$(curl -Ss -L --fail-with-body -X PATCH ${hydraUrl}/admin/clients/$id -d "$body")
+  if [[ $? != 0 ]]; then
+    error=$(echo $response | jq .error)
+    fail "Failed to submit request to Hydra: $error"
+  fi
+}
+
 function generateSecret() {
   clientId=$1
   
@@ -315,6 +351,17 @@ case "${operation}" in
     echo "Successfully removed role from client"
     ;;
 
+  "update")
+    verifyEnvironment
+    [[ "$id" == "" ]] && fail "Id must be provided"
+    [[ "$name" == "" ]] && fail "Name must be provided"
+    [[ "$note" == "" ]] && fail "Note must be provided"
+
+    lock
+    update "$id" "$name" "$note"
+    echo "Successfully updated client"
+    ;;
+
   "generate-secret")
     verifyEnvironment
     [[ "$id" == "" ]] && fail "Id must be provided"
diff --git a/salt/soc/files/bin/salt-relay.sh b/salt/soc/files/bin/salt-relay.sh
index d36e8549e..e803a613f 100755
--- a/salt/soc/files/bin/salt-relay.sh
+++ b/salt/soc/files/bin/salt-relay.sh
@@ -177,20 +177,20 @@ function manage_client() {
       delete)
         id=$(echo "$request" | jq -r .id)
         log "Performing client '$op' for client '$id'"
-        response=$(so-client "$op" --id "$id" --skip-sync)
+        response=$(so-client "$op" --id "$id")
         exit_code=$?
         ;;
       addrole|delrole)
         id=$(echo "$request" | jq -r .id)
         role=$(echo "$request" | jq -r .role)
         log "Performing '$op' for client '$id' with role '$role'"
-        response=$(so-client "$op" --id "$id" --role "$role" --skip-sync)
+        response=$(so-client "$op" --id "$id" --role "$role")
         exit_code=$?
         ;;
       generate-secret)
         id=$(echo "$request" | jq -r .id)
         log "Performing '$op' operation for client '$id'"
-        response=$(so-client "$op" --id "$id" --skip-sync)
+        response=$(so-client "$op" --id "$id")
         webResponse=$response
         exit_code=$?
         ;;