diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js
index 32c3b15898..0f9d457878 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js
@@ -263,10 +263,10 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application,
     }
 
     $scope.save = function() {
-        if ($scope.create) {
-            if (!$scope.application.bearerOnly && (!$scope.application.redirectUris || $scope.application.redirectUris.length == 0)) {
-                Notifications.error("You must specify at least one redirect uri");
-            } else {
+        if (!$scope.application.bearerOnly && (!$scope.application.redirectUris || $scope.application.redirectUris.length == 0)) {
+            Notifications.error("You must specify at least one redirect uri");
+        } else {
+            if ($scope.create) {
                 Application.save({
                     realm: realm.realm,
                     application: ''
@@ -277,16 +277,16 @@ module.controller('ApplicationDetailCtrl', function($scope, realm, application,
                     $location.url("/realms/" + realm.realm + "/applications/" + id);
                     Notifications.success("The application has been created.");
                 });
+            } else {
+                Application.update({
+                    realm : realm.realm,
+                    application : application.name
+                }, $scope.application, function() {
+                    $scope.changed = false;
+                    application = angular.copy($scope.application);
+                    Notifications.success("Your changes have been saved to the application.");
+                });
             }
-        } else {
-            Application.update({
-                realm : realm.realm,
-                application : application.name
-            }, $scope.application, function() {
-                $scope.changed = false;
-                application = angular.copy($scope.application);
-                Notifications.success("Your changes have been saved to the application.");
-            });
         }
     };
 
diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js
index aabb96ec10..9cc08a6b8b 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/oauth-clients.js
@@ -133,25 +133,29 @@ module.controller('OAuthClientDetailCtrl', function($scope, realm, oauth, OAuthC
     }
 
     $scope.save = function() {
-        if ($scope.create) {
-            OAuthClient.save({
-                realm: realm.realm
-            }, $scope.oauth, function (data, headers) {
-                $scope.changed = false;
-                var l = headers().location;
-                var id = l.substring(l.lastIndexOf("/") + 1);
-                $location.url("/realms/" + realm.realm + "/oauth-clients/" + id);
-                Notifications.success("The oauth client has been created.");
-            });
+        if (!$scope.oauth.bearerOnly && (!$scope.oauth.redirectUris || $scope.oauth.redirectUris.length == 0)) {
+            Notifications.error("You must specify at least one redirect uri");
         } else {
-            OAuthClient.update({
-                realm : realm.realm,
-                id : oauth.id
-            }, $scope.oauth, function() {
-                $scope.changed = false;
-                oauth = angular.copy($scope.oauth);
-                Notifications.success("Your changes have been saved to the oauth client.");
-            });
+            if ($scope.create) {
+                OAuthClient.save({
+                    realm: realm.realm
+                }, $scope.oauth, function (data, headers) {
+                    $scope.changed = false;
+                    var l = headers().location;
+                    var id = l.substring(l.lastIndexOf("/") + 1);
+                    $location.url("/realms/" + realm.realm + "/oauth-clients/" + id);
+                    Notifications.success("The oauth client has been created.");
+                });
+            } else {
+                OAuthClient.update({
+                    realm : realm.realm,
+                    id : oauth.id
+                }, $scope.oauth, function() {
+                    $scope.changed = false;
+                    oauth = angular.copy($scope.oauth);
+                    Notifications.success("Your changes have been saved to the oauth client.");
+                });
+            }
         }
     };