diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/authz/policy/provider/resource-server-policy-drools-detail.html b/themes/src/main/resources/theme/base/admin/resources/partials/authz/policy/provider/resource-server-policy-drools-detail.html
index a121f17255..ba53e0b97e 100644
--- a/themes/src/main/resources/theme/base/admin/resources/partials/authz/policy/provider/resource-server-policy-drools-detail.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/authz/policy/provider/resource-server-policy-drools-detail.html
@@ -88,10 +88,10 @@
                     <select class="form-control" name="policy.config.scannerPeriodUnit"
                             data-ng-model="policy.config.scannerPeriodUnit"
                             ng-disabled="!policy.config.sessionName">
-                        <option>{{:: 'seconds' | translate}}</option>
-                        <option>{{:: 'minutes' | translate}}</option>
-                        <option>{{:: 'hours' | translate}}</option>
-                        <option>{{:: 'days' | translate}}</option>
+                        <option value="Seconds">{{:: 'seconds' | translate}}</option>
+                        <option value="Minutes">{{:: 'minutes' | translate}}</option>
+                        <option value="Hours">{{:: 'hours' | translate}}</option>
+                        <option value="Days">{{:: 'days' | translate}}</option>
                     </select>
                 </div>
                 <kc-tooltip>{{:: 'authz-policy-drools-update-period.tooltip' | translate}}</kc-tooltip>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html b/themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html
index 3b6c48cc97..4a6312b4d7 100644
--- a/themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/client-clustering.html
@@ -19,10 +19,10 @@
                                    max="31536000" data-ng-model="client.nodeReRegistrationTimeout"
                                    id="nodeReRegistrationTimeout" name="nodeReRegistrationTimeout"/>
                             <select class="form-control" name="nodeReRegistrationTimeoutUnit" data-ng-model="client.nodeReRegistrationTimeoutUnit" >
-                                <option data-ng-selected="!client.nodeReRegistrationTimeoutUnit">{{:: 'seconds' | translate}}</option>
-                                <option>{{:: 'minutes' | translate}}</option>
-                                <option>{{:: 'hours' | translate}}</option>
-                                <option>{{:: 'days' | translate}}</option>
+                                <option data-ng-selected="!client.nodeReRegistrationTimeoutUnit" value="Seconds">{{:: 'seconds' | translate}}</option>
+                                <option value="Minutes">{{:: 'minutes' | translate}}</option>
+                                <option value="Hours">{{:: 'hours' | translate}}</option>
+                                <option value="Days">{{:: 'days' | translate}}</option>
                             </select>
                         </div>
                     </div>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/realm-events-config.html b/themes/src/main/resources/theme/base/admin/resources/partials/realm-events-config.html
index a1c5a8077b..a304784b2a 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/realm-events-config.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/realm-events-config.html
@@ -58,9 +58,9 @@
                     <div class="col-md-6 time-selector">
                         <input class="form-control" type="number" data-ng-model="eventsConfig.eventsExpiration" id="expiration" name="expiration" min="0"/>
                         <select class="form-control" name="expirationUnit" data-ng-model="eventsConfig.expirationUnit">
-                            <option>{{:: 'minutes' | translate}}</option>
-                            <option>{{:: 'hours' | translate}}</option>
-                            <option>{{:: 'days' | translate}}</option>
+                            <option value="Minutes">{{:: 'minutes' | translate}}</option>
+                            <option value="Hours">{{:: 'hours' | translate}}</option>
+                            <option value="Days">{{:: 'days' | translate}}</option>
                         </select>
                     </div>
                 </div>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html b/themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html
index 93671ef0a7..81690be0aa 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/realm-identity-provider-oidc.html
@@ -167,9 +167,9 @@
                         <select class="form-control" id="prompt" ng-model="identityProvider.config.prompt">
                             <option value="">{{:: 'unspecified.option' | translate}}</option>
                             <option value="none">{{:: 'none.option' | translate}}</option>
-                            <option>{{:: 'consent.option' | translate}}</option>
-                            <option>{{:: 'login.option' | translate}}</option>
-                            <option>{{:: 'select-account.option' | translate}}</option>
+                            <option value="consent">{{:: 'consent.option' | translate}}</option>
+                            <option value="login">{{:: 'login.option' | translate}}</option>
+                            <option value="select_account">{{:: 'select-account.option' | translate}}</option>
                         </select>
                     </div>
                 </div>