diff --git a/rhodecode/templates/admin/repos/repo_add_base.mako b/rhodecode/templates/admin/repos/repo_add_base.mako
index cd05ea90..b573a31a 100644
--- a/rhodecode/templates/admin/repos/repo_add_base.mako
+++ b/rhodecode/templates/admin/repos/repo_add_base.mako
@@ -38,6 +38,15 @@ ${h.secure_form(h.route_path('repo_create'), request=request)}
                 </span>
             </div>
         </div>
+        <div class="field">
+            <div class="label">
+                <label for="repo_type">${_('Type')}:</label>
+            </div>
+            <div class="select">
+                ${h.select('repo_type','hg',c.backends)}
+                <span class="help-block">${_('Set the type of repository to create.')}</span>
+            </div>
+        </div>
         <div class="field">
             <div class="label">
                 <label for="repo_description">${_('Description')}:</label>
@@ -66,24 +75,6 @@ ${h.secure_form(h.route_path('repo_create'), request=request)}
                  <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
              </div>
         </div>
-        <div id="copy_perms" class="field">
-            <div class="label label-checkbox">
-                <label for="repo_copy_permissions">${_('Copy Parent Group Permissions')}:</label>
-            </div>
-            <div class="checkboxes">
-                ${h.checkbox('repo_copy_permissions', value="True", checked="checked")}
-                <span class="help-block">${_('Copy permission set from the parent repository group.')}</span>
-            </div>
-        </div>
-        <div class="field">
-            <div class="label">
-                <label for="repo_type">${_('Type')}:</label>
-            </div>
-            <div class="select">
-                ${h.select('repo_type','hg',c.backends)}
-                <span class="help-block">${_('Set the type of repository to create.')}</span>
-            </div>
-        </div>
         <div class="field">
             <div class="label">
                 <label for="repo_landing_rev">${_('Landing commit')}:</label>
@@ -93,6 +84,15 @@ ${h.secure_form(h.route_path('repo_create'), request=request)}
                 <span class="help-block">${_('The default commit for file pages, downloads, full text search index, and README generation.')}</span>
             </div>
         </div>
+        <div id="copy_perms" class="field">
+            <div class="label label-checkbox">
+                <label for="repo_copy_permissions">${_('Copy Parent Group Permissions')}:</label>
+            </div>
+            <div class="checkboxes">
+                ${h.checkbox('repo_copy_permissions', value="True", checked="checked")}
+                <span class="help-block">${_('Copy permission set from the parent repository group.')}</span>
+            </div>
+        </div>
         <div class="field">
             <div class="label label-checkbox">
                 <label for="repo_private">${_('Private Repository')}:</label>
diff --git a/rhodecode/templates/forks/fork.mako b/rhodecode/templates/forks/fork.mako
index 4f6b386e..e26cc7e9 100644
--- a/rhodecode/templates/forks/fork.mako
+++ b/rhodecode/templates/forks/fork.mako
@@ -83,16 +83,6 @@
                 </div>
             </div>
 
-            <div class="field">
-                <div class="label label-checkbox">
-                    <label for="private">${_('Private')}:</label>
-                </div>
-                <div class="checkboxes">
-                    ${h.checkbox('private',value="True")}
-                    <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
-                </div>
-            </div>
-
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Copy permissions')}:</label>
@@ -103,6 +93,16 @@
                 </div>
             </div>
 
+            <div class="field">
+                <div class="label label-checkbox">
+                    <label for="private">${_('Private')}:</label>
+                </div>
+                <div class="checkboxes">
+                    ${h.checkbox('private',value="True")}
+                    <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
+                </div>
+            </div>
+
             <div class="buttons">
                 ${h.submit('',_('Fork this Repository'),class_="btn")}
             </div>