diff --git a/src/views/app.html b/src/views/app.html
index ef243e593..f60469811 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -635,7 +635,7 @@
                     </div>
                   </div>
 
-                  <input class="ng-hide" type="submit" ng-disabled="accessForm.$invalid || access.busy"/>
+                  <input class="ng-hide" type="submit" ng-disabled="(access.accessRestrictionOption === 'groups' && !access.isAccessRestrictionValid()) || accessForm.$invalid || access.busy"/>
                 </div>
               </form>
             </fieldset>
@@ -643,7 +643,7 @@
         </div>
         <div class="row">
           <div class="col-md-12 text-right">
-            <button class="btn btn-outline btn-primary pull-right" ng-click="access.submit()" ng-disabled="access.$invalid || access.busy"><i class="fa fa-circle-notch fa-spin" ng-show="access.busy"></i> Save</button>
+            <button class="btn btn-outline btn-primary pull-right" ng-click="access.submit()" ng-disabled="(access.accessRestrictionOption === 'groups' && !access.isAccessRestrictionValid()) || access.$invalid || access.busy"><i class="fa fa-circle-notch fa-spin" ng-show="access.busy"></i> Save</button>
           </div>
         </div>
         <div class="row" ng-show="app.manifest.addons.localstorage.ftp">
diff --git a/src/views/appstore.html b/src/views/appstore.html
index 6730bcb7c..f64747ed3 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -131,7 +131,7 @@
               </div>
             </div>
 
-            <input class="ng-hide" type="submit" ng-disabled="appInstallForm.$invalid || busy"/>
+            <input class="ng-hide" type="submit" ng-disabled="(appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()) || appInstallForm.$invalid || busy"/>
           </form>
         </div>
         <div class="collapse" id="collapseMediaLinksCarousel" data-toggle="false">
@@ -156,7 +156,7 @@
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
         <button type="button" class="btn btn-danger" ng-show="appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
         <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo'" ng-click="appInstall.showForm()">Install</button>
-        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> Install {{ appInstall.needsOverwrite ? 'and overwrite DNS' : '' }}</button>
+        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="(appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()) || appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> Install {{ appInstall.needsOverwrite ? 'and overwrite DNS' : '' }}</button>
       </div>
     </div>
   </div>