diff --git a/api/system-accounts-provider/read b/api/system-accounts-provider/read
index 83ea8a65a..8144a6749 100755
--- a/api/system-accounts-provider/read
+++ b/api/system-accounts-provider/read
@@ -107,6 +107,7 @@ sub getDefaults
     my $o = NethServer::SSSD->new(@_);
     my $db = esmith::ConfigDB->open_ro();
     my $ip = $db->get_prop('nsdc','IpAddress') || '';
+    my $ShellOverrideStatus = ($db->get_prop('sssd','ShellOverrideStatus') || 'disabled') eq 'enabled' ? JSON::true : JSON::false;
 
     my $dump = {
         @_,
@@ -128,6 +129,7 @@ sub getDefaults
         'DiscoverDcType' => $o->{'DiscoverDcType'},
         'NsdcIp' => $ip,
         'IsLocal' => $o->isLocalProvider(),
+        'ShellOverride' => $ShellOverrideStatus,
     };
 
     return $dump;
diff --git a/ui/src/components/system/UsersGroups.vue b/ui/src/components/system/UsersGroups.vue
index 29880f7a5..cf5333733 100644
--- a/ui/src/components/system/UsersGroups.vue
+++ b/ui/src/components/system/UsersGroups.vue
@@ -542,7 +542,7 @@
                   />
                 </div>
               </div>
-              <div v-if="!newUser.isPassEdit && newUser.advanced" class="form-group">
+              <div v-if="!newUser.isPassEdit && newUser.advanced && !ShellOverride" class="form-group">
                 <label class="col-sm-3 control-label" for="shell">
                   {{$t('users_groups.remote_shell')}}
                   <doc-info
@@ -1796,6 +1796,7 @@ export default {
   },
   data() {
     return {
+      ShellOverride: false,
       view: {
         isLoaded: false,
         isAuth: false,
@@ -2270,6 +2271,7 @@ export default {
           }
 
           if (context.users.provider) {
+            context.ShellOverride =  success.ShellOverride;
             context.getUsers();
             context.getGroups();
           } else {