diff --git a/rhodecode/templates/admin/repos/repo_edit_remote.mako b/rhodecode/templates/admin/repos/repo_edit_remote.mako
--- a/rhodecode/templates/admin/repos/repo_edit_remote.mako
+++ b/rhodecode/templates/admin/repos/repo_edit_remote.mako
@@ -6,14 +6,19 @@
 
         <h4>${_('Manually pull/push changes from/to external URLs.')}</h4>
 
-        %if c.rhodecode_db_repo.clone_uri or c.rhodecode_db_repo.push_uri:
-
-            <table>
-            % if c.rhodecode_db_repo.clone_uri:
+        <table>
                 <tr>
                 <td><div style="min-width: 80px"><strong>${_('Pull url')}</strong></div></td>
-                <td><a href="${c.rhodecode_db_repo.clone_uri}">${c.rhodecode_db_repo.clone_uri_hidden}</a></td>
+                <td>
+                    % if c.rhodecode_db_repo.clone_uri:
+                    <a href="${c.rhodecode_db_repo.clone_uri}">${c.rhodecode_db_repo.clone_uri_hidden}</a>
+                    % else:
+                        ${_('This repository does not have any pull url set.')}
+                        <a href="${h.route_path('edit_repo', repo_name=c.rhodecode_db_repo.repo_name)}">${_('Set remote url.')}</a>
+                    % endif
+                </td>
                 </tr>
+                % if c.rhodecode_db_repo.clone_uri:
                 <tr>
                     <td></td>
                     <td>
@@ -38,12 +43,18 @@
                         ${h.end_form()}
                     </td>
                 </tr>
-            % endif
+                % endif
 
-            % if c.rhodecode_db_repo.push_uri:
                 <tr>
                 <td><div style="min-width: 80px"><strong>${_('Push url')}</strong></div></td>
-                <td><a href="${c.rhodecode_db_repo.push_uri_hidden}">${c.rhodecode_db_repo.push_uri_hidden}</a></td>
+                <td>
+                    % if c.rhodecode_db_repo.push_uri:
+                    <a href="${c.rhodecode_db_repo.push_uri_hidden}">${c.rhodecode_db_repo.push_uri_hidden}</a>
+                    % else:
+                        ${_('This repository does not have any push url set.')}
+                        <a href="${h.route_path('edit_repo', repo_name=c.rhodecode_db_repo.repo_name)}">${_('Set remote url.')}</a>
+                    % endif
+                </td>
                 </tr>
                 <tr>
                     <td></td>
@@ -51,19 +62,7 @@
                         ${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:sales@rhodecode.com">sales@rhodecode.com</a>')|n}
                     </td>
                 </tr>
-            % endif
 
             </table>
-
-        %else:
-
-          ${_('This repository does not have any remote mirror url set.')}
-          <a href="${h.route_path('edit_repo', repo_name=c.rhodecode_db_repo.repo_name)}">${_('Set remote url.')}</a>
-          <br/>
-          <br/>
-          <button class="btn disabled" type="submit" disabled="disabled">
-            ${_('Pull changes from remote location')}
-          </button>
-        %endif
     </div>
 </div>