diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/details.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/details.xhtml
index b1a4d70d307..d191394e069 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/details.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/userEdit/details.xhtml
@@ -123,7 +123,9 @@
                             onchange="toggleSave()" required="#{empty param['editForm:saveButtonToggler']}"
                             redisplay="true"/>
             </h:panelGroup>
-            <div>
+            <h:panelGroup layout="block"
+                          id="defaultClientWrapper"
+                          rendered="#{UserForm.userObject.clients.size() gt 1}">
                 <p:outputLabel for="defaultClient"
                                value="#{msgs['defaultClient']}"
                                title="#{msgs['defaultClient']}"/>
@@ -139,7 +141,7 @@
                     <p:ajax event="change"
                             oncomplete="toggleSave()"/>
                 </p:selectOneMenu>
-            </div>
+            </h:panelGroup>
             <div>
                 <!-- table size -->
                 <p:outputLabel for="table-size" value="#{msgs.tableSize}" />