diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index b35e2ef1f1..6907a80db4 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -96,6 +96,7 @@
           <td align='left'>
             <div class='input-group'>
             <?php
+            if(!$showVisionList) echo html::hidden("visions[$i][]", $this->config->vision);
             echo html::input("password[$i]", '', "class='form-control' onkeyup='toggleCheck(this, $i)'");
             echo "<span class='input-group-addon passwordStrength'></span>";
             if($i != 1) echo "<span class='input-group-addon passwordBox'><input type='checkbox' name='ditto[$i]' id='ditto$i' " . ($i > 1 ? "checked" : '') . " /> {$lang->user->ditto}</span>";
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index 9fb09fb21a..d991f6bf5c 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -87,8 +87,8 @@
           <td><?php echo html::input("realname[$user->id]", $user->realname, "class='form-control'");?></td>
           <?php if($showVisionList):?>
             <td class="<?php echo $config->systemMode == 'new' ? 'text-left' : 'text-center';?>"><?php echo $config->systemMode == 'new' ? html::select("visions[$user->id][]", $visionList, $user->visions, "class='form-control chosen' multiple") : $visionList['rnd'];?></td>
-          <?php endif;?>
-          <?php if($config->systemMode == 'classic') echo html::hidden("visions[$user->id][]", 'rnd');?>
+            <?php if($config->systemMode == 'classic') echo html::hidden("visions[$user->id][]", 'rnd');?>
+          <?php else: echo html::hidden("visions[$user->id][]", $this->config->vision); endif;?>
           <td><?php echo html::select("role[$user->id]",    $lang->user->roleList, $role, "class='form-control'");?></td>
           <td><?php echo html::select("type[$user->id]",    $lang->user->typeList, $type, "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'commiter', 'hidden')?>'><?php echo html::input("commiter[$user->id]", $user->commiter, "class='form-control'");?></td>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index 3a93dd83e4..35f26e1182 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -16,6 +16,10 @@
 <?php if(!empty($config->safe->mode)) $lang->user->placeholder->password1 = $lang->user->placeholder->passwordStrength[$config->safe->mode]?>
 <?php js::set('holders', $lang->user->placeholder);?>
 <?php js::set('roleGroup', $roleGroup);?>
+<?php
+$visionList     = $this->user->getVisionList();
+$showVisionList = count($visionList) > 1;
+?>
 <div id="mainContent" class="main-content">
   <div class="center-block">
     <div class="main-header">
@@ -60,8 +64,7 @@
           <th><?php echo $lang->user->password2;?></th>
           <td><?php echo html::password('password2', '', "class='form-control'");?></td>
         </tr>
-        <?php $visionList = $this->user->getVisionList();?>
-        <tr <?php if(count($visionList) < 2) echo "class='hide'";?>>
+        <tr <?php if(!$showVisionList) echo "class='hide'";?>>
           <th><?php echo $lang->user->visions;?></th>
           <td><?php echo html::checkbox('visions', $visionList, isset($visionList[$this->config->vision]) ? $this->config->vision : key($visionList), "class='form-control'");?></td>
         </tr>
@@ -106,6 +109,7 @@
         <tr>
           <th></th>
           <td class='text-center form-actions'>
+            <?php if(!$showVisionList) echo html::hidden("visions[]", $this->config->vision);?>
             <?php echo html::submitButton();?>
             <?php echo html::backButton();?>
           </td>