diff --git a/app/templates/service_creds.html b/app/templates/service_creds.html
index 0f7fee20b..253afa1ef 100644
--- a/app/templates/service_creds.html
+++ b/app/templates/service_creds.html
@@ -152,8 +152,8 @@ <h5 class="modal-title">Vault Info</h5>
               <div class="modal-body">
               </div>
               <div class="modal-footer">
-                <a class="btn btn-secondary canceltBtn" role="button" data-bs-dismiss="modal">Cancel</a>
-                <button type="submit" class="btn btn-success updatetBtn">Update</button>
+                <button class="btn btn-secondary cancelVaultBtn" role="button" data-bs-dismiss="modal">Cancel</button>
+                <button type="submit" class="btn btn-success submitBtn">Update</button>
               </div>
             </div>
           </div>
@@ -224,6 +224,17 @@ <h5 class="modal-title">Vault Info</h5>
   });
 });
 
+$(document).ready(function () {
+    $("#vaultForm").submit(function () {
+        //disable button on click
+        $(".submitBtn").attr("disabled", true);
+        $(".cancelVaultBtn").attr("disabled", true);
+        // add spinner to button
+        $(".submitBtn").html( `<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span> Updating...` );
+        return true;
+    });
+});
+
 </script>
 {% endblock %}
 
diff --git a/app/utils.py b/app/utils.py
index 22284545c..e9b962dc8 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -345,9 +345,9 @@ def _addTabs(tabs, toscaInfo, tosca):
                     toscaInfo[tosca]['inputs'][input_name]["pattern"] = input_params["pattern"]
 
 
-def _addAddons(toscaInfo, toscaTemplates, toscaDir):
+def _addAddons(toscaInfo, toscaDir):
     # Add addons to description
-    for tosca in toscaTemplates:
+    for tosca in toscaInfo.keys():
         if "childs" in toscaInfo[tosca]["metadata"] and toscaInfo[tosca]["metadata"]["childs"]:
             if 'addons' not in toscaInfo[tosca]['metadata']:
                 toscaInfo[tosca]['metadata']["addons"] = ""
@@ -407,7 +407,7 @@ def extractToscaInfo(toscaDir, toscaTemplates, tags_to_hide):
         toscaInfoOrder = OrderedDict(sorted(toscaInfo.items(), key=lambda x: x[1]["metadata"]['order']))
 
     # Add addons to description
-    _addAddons(toscaInfo, toscaTemplates, toscaDir)
+    _addAddons(toscaInfo, toscaDir)
 
     return toscaInfoOrder