diff --git a/src/app/vault/views/vaultAddFolder.html b/src/app/vault/views/vaultAddFolder.html
index 703a620794..e1a8ba8809 100644
--- a/src/app/vault/views/vaultAddFolder.html
+++ b/src/app/vault/views/vaultAddFolder.html
@@ -11,7 +11,7 @@
             </ul>
         </div>
         <div class="form-group" show-errors>
-            <label for="name">Name</label>
+            <label for="name">Name</label> <span>*</span>
             <input type="text" id="name" name="Name" ng-model="folder.name" class="form-control" required api-field />
         </div>
     </div>
diff --git a/src/app/vault/views/vaultAddLogin.html b/src/app/vault/views/vaultAddLogin.html
index b04d71f89c..eb29f64146 100644
--- a/src/app/vault/views/vaultAddLogin.html
+++ b/src/app/vault/views/vaultAddLogin.html
@@ -10,6 +10,22 @@
                 <li ng-repeat="e in addLoginForm.$errors">{{e}}</li>
             </ul>
         </div>
+        <div class="row">
+            <div class="col-md-6">
+                <div class="form-group" show-errors>
+                    <label for="name">Name</label> <span>*</span>
+                    <input type="text" id="name" name="Name" ng-model="login.name" class="form-control" required api-field />
+                </div>
+            </div>
+            <div class="col-md-6">
+                <div class="form-group" show-errors>
+                    <label for="folder">Folder</label>
+                    <select id="folder" name="FolderId" ng-model="login.folderId" class="form-control" api-field>
+                        <option ng-repeat="folder in folders | orderBy: folderSort" value="{{folder.id}}">{{folder.name}}</option>
+                    </select>
+                </div>
+            </div>
+        </div>
         <div class="form-group" show-errors>
             <label for="uri">URI</label>
             <div class="input-group">
@@ -23,22 +39,6 @@
                 </span>
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-6">
-                <div class="form-group" show-errors>
-                    <label for="name">Name</label>
-                    <input type="text" id="name" name="Name" ng-model="login.name" class="form-control" required api-field />
-                </div>
-            </div>
-            <div class="col-md-6">
-                <div class="form-group" show-errors>
-                    <label for="folder">Folder</label>
-                    <select id="folder" name="FolderId" ng-model="login.folderId" class="form-control" api-field>
-                        <option ng-repeat="folder in folders | orderBy: folderSort" value="{{folder.id}}">{{folder.name}}</option>
-                    </select>
-                </div>
-            </div>
-        </div>
         <div class="row">
             <div class="col-md-6">
                 <div class="form-group" show-errors>
diff --git a/src/app/vault/views/vaultEditFolder.html b/src/app/vault/views/vaultEditFolder.html
index 2975108030..c59e8bb2b8 100644
--- a/src/app/vault/views/vaultEditFolder.html
+++ b/src/app/vault/views/vaultEditFolder.html
@@ -11,7 +11,7 @@
             </ul>
         </div>
         <div class="form-group" show-errors>
-            <label for="name">Name</label>
+            <label for="name">Name</label> <span>*</span>
             <input type="text" id="name" name="Name" ng-model="folder.name" class="form-control" required api-field />
         </div>
     </div>
diff --git a/src/app/vault/views/vaultEditLogin.html b/src/app/vault/views/vaultEditLogin.html
index da7ef64b73..56c244a123 100644
--- a/src/app/vault/views/vaultEditLogin.html
+++ b/src/app/vault/views/vaultEditLogin.html
@@ -10,6 +10,22 @@
                 <li ng-repeat="e in editLoginForm.$errors">{{e}}</li>
             </ul>
         </div>
+        <div class="row">
+            <div class="col-md-6">
+                <div class="form-group" show-errors>
+                    <label for="name">Name</label> <span>*</span>
+                    <input type="text" id="name" name="Name" ng-model="login.name" class="form-control" required api-field />
+                </div>
+            </div>
+            <div class="col-md-6">
+                <div class="form-group" show-errors>
+                    <label for="folder">Folder</label>
+                    <select id="folder" name="FolderId" ng-model="login.folderId" class="form-control" api-field>
+                        <option ng-repeat="folder in folders | orderBy: folderSort" value="{{folder.id}}">{{folder.name}}</option>
+                    </select>
+                </div>
+            </div>
+        </div>
         <div class="form-group" show-errors>
             <label for="uri">URI</label>
             <div class="input-group">
@@ -26,22 +42,6 @@
                 </span>
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-6">
-                <div class="form-group" show-errors>
-                    <label for="name">Name</label>
-                    <input type="text" id="name" name="Name" ng-model="login.name" class="form-control" required api-field />
-                </div>
-            </div>
-            <div class="col-md-6">
-                <div class="form-group" show-errors>
-                    <label for="folder">Folder</label>
-                    <select id="folder" name="FolderId" ng-model="login.folderId" class="form-control" api-field>
-                        <option ng-repeat="folder in folders | orderBy: folderSort" value="{{folder.id}}">{{folder.name}}</option>
-                    </select>
-                </div>
-            </div>
-        </div>
         <div class="row">
             <div class="col-md-6">
                 <div class="form-group" show-errors>