diff --git a/static/css/directives/ui/repo-list-view.css b/static/css/directives/ui/repo-list-view.css
index 46076a7f3..559f4c04b 100644
--- a/static/css/directives/ui/repo-list-view.css
+++ b/static/css/directives/ui/repo-list-view.css
@@ -3,6 +3,10 @@
   margin-bottom: 10px;
 }
 
+.repo-list-view.padded {
+    padding: 10px;
+}
+
 .repo-list-view-element {
     min-height: 40px;
 }
\ No newline at end of file
diff --git a/static/directives/external-login-button.html b/static/directives/external-login-button.html
index da0d94653..abea9dfda 100644
--- a/static/directives/external-login-button.html
+++ b/static/directives/external-login-button.html
@@ -5,7 +5,7 @@
     <img ng-src="{{ providerInfo.icon().url }}" ng-if="providerInfo.icon().url">
     <i class="fa" ng-class="providerInfo.icon().icon" ng-if="providerInfo.icon().icon"></i>
     <span class="login-text" ng-if="action != 'attach'" style="vertical-align: middle">
-        <span class="prefix">Sign in with </span><span class="suffix">{{ providerInfo.title() }}</span>
+        <span class="prefix">Sign in with&nbsp;</span><span class="suffix">{{ providerInfo.title() }}</span>
     </span>
     <span class="login-text" ng-if="action == 'attach'" style="vertical-align: middle">
       Attach to {{ providerInfo.title() }}
diff --git a/static/directives/signup-form.html b/static/directives/signup-form.html
index 89a616a4e..584dfd1af 100644
--- a/static/directives/signup-form.html
+++ b/static/directives/signup-form.html
@@ -3,6 +3,10 @@
     Create new account
   </h4>
 
+  <div class="co-alert co-alert-warning" ng-show="registerIssue">
+    {{ registerIssue }}
+  </div>
+
   <form class="form-signup" name="signupForm" ng-submit="register()" ng-show="!awaitingConfirmation && !registering">
     <label for="username">Username:</label>
     <input type="text" class="form-control" placeholder="Requested username" name="username" ng-model="newUser.username" autofocus required ng-pattern="/^[a-z0-9_]{4,30}$/">
diff --git a/static/js/directives/ui/signup-form.js b/static/js/directives/ui/signup-form.js
index 69cafa5ad..4129d6af7 100644
--- a/static/js/directives/ui/signup-form.js
+++ b/static/js/directives/ui/signup-form.js
@@ -13,16 +13,15 @@ angular.module('quay').directive('signupForm', function () {
       'hideRegisteredMessage': '@hideRegisteredMessage',
       'userRegistered': '&userRegistered'
     },
-    controller: function($scope, $location, $timeout, ApiService, KeyService, UserService, Config, UIService, ExternalLoginService) {
-      $('.form-signup').popover();
-
+    controller: function($scope, $location, $timeout, ApiService, KeyService, UserService, Config, ExternalLoginService) {
       $scope.awaitingConfirmation = false;
       $scope.registering = false;
       $scope.Config = Config;
+      $scope.registerIssue = null;
 
       $scope.register = function() {
-        UIService.hidePopover('#signupButton');
         $scope.registering = true;
+        $scope.registerIssue = null;
 
         if ($scope.inviteCode) {
           $scope.newUser['invite_code'] = $scope.inviteCode;
@@ -45,7 +44,7 @@ angular.module('quay').directive('signupForm', function () {
           UserService.load();
         }, function(result) {
           $scope.registering  = false;
-          UIService.showFormError('#signupButton', result);
+          $scope.registerIssue = ApiService.getErrorMessage(result);
         });
       };
     }
diff --git a/static/partials/org-view.html b/static/partials/org-view.html
index 0628d0798..27a542de2 100644
--- a/static/partials/org-view.html
+++ b/static/partials/org-view.html
@@ -17,7 +17,7 @@
     </div>
 
     <div class="co-main-content-panel" ng-if="user.anonymous || !isMember">
-      <div class="repo-list-view" namespaces="[organization]"></div>
+      <div class="repo-list-view padded" namespaces="[organization]">&nbsp;</div>
     </div>
 
     <div class="cor-tab-panel" ng-if="!user.anonymous && isMember">
diff --git a/static/partials/user-view.html b/static/partials/user-view.html
index 08c1e1ec6..74c674e91 100644
--- a/static/partials/user-view.html
+++ b/static/partials/user-view.html
@@ -17,7 +17,7 @@
     </div>
 
     <div class="co-main-content-panel user-repo-list" ng-if="!context.viewuser.is_me">
-      <div class="repo-list-view" namespaces="[context.viewuser]"></div>
+      <div class="repo-list-view padded" namespaces="[context.viewuser]">&nbsp;</div>
     </div>
 
     <div class="cor-tab-panel" ng-if="context.viewuser.is_me">