diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-generic.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-generic.html
index 35b2938b01..1e9c2e2c4c 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-generic.html
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/federated-generic.html
@@ -70,7 +70,7 @@
 
             <div class="pull-right form-actions" data-ng-show="create && access.manageUsers">
                 <button kc-cancel data-ng-click="cancel()">Cancel</button>
-                <button kc-save data-ng-show="changed">Save</button>
+                <button kc-save>Save</button>
             </div>
 
             <div class="pull-right form-actions" data-ng-show="!create && access.manageUsers">
diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserFederationResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserFederationResource.java
index f03d4102ec..acee11df1e 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/UserFederationResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/UserFederationResource.java
@@ -192,6 +192,7 @@ public class UserFederationResource {
     @GET
     @Path("instances")
     @Produces("application/json")
+    @NoCache
     public List<UserFederationProviderRepresentation> getUserFederationInstances() {
         logger.info("getUserFederationInstances");
         auth.requireManage();