diff --git a/static/partials/repo-list.html b/static/partials/repo-list.html
index b0e1ddc3d..8dc81ddeb 100644
--- a/static/partials/repo-list.html
+++ b/static/partials/repo-list.html
@@ -1,3 +1,12 @@
+<div ng-if="user.anonymous" class="container signin-container">
+  <div class="row">
+    <div class="col-sm-6 col-sm-offset-3">
+        <div class="empty-primary-msg">You must be signed in to view repositories. </div>
+      <div class="user-setup" redirect-url="redirectUrl"></div>
+    </div>
+  </div>
+</div>
+</div>
 <div class="row" ng-if="!user.anonymous">
   <div class="repo-list-sidebar col-lg-3 col-lg-push-9 col-md-3 col-md-push-9 col-sm-4 col-sm-push-8 col-xs-12">
     <div class="button-bar-right">
@@ -92,44 +101,39 @@
             <i class="fa fa-sitemap"></i>
             <a href="/organization/{{ namespace.name }}">{{ namespace.name }}</a>
           </div>
-          <div ng-show="namespace.repositories.value.length > 0">
-            <div class="row">
-              <div class="col-lg-4 col-md-6 col-sm-6 col-xs-12" ng-repeat="repository in namespace.repositories.value">
-                <div class="panel panel-default">
-                  <div class="panel-body" ng-class="repository.is_starred ? 'starred' : ''">
-                    <div class="row">
-                      <div class="col-lg-10 col-md-10 col-sm-10 col-xs-10 repo-panel-title-row">
-                        <span class="repo-icon repo-circle no-background" repo="repository"></span>
-                        <a ng-href="/repository/{{repository.namespace}}/{{ repository.name }}" class="repo-panel-repo-link"
-                           data-repo="{{repository.namespace}}/{{ repository.name }}">
-                           {{ repository.namespace }}/{{ repository.name }}
-                        </a>
+            <div ng-show="namespace.repositories.value.length > 0">
+              <div class="row">
+                <div class="col-lg-4 col-md-6 col-sm-6 col-xs-12" ng-repeat="repository in namespace.repositories.value">
+                  <div class="panel panel-default">
+                    <div class="panel-body" ng-class="repository.is_starred ? 'starred' : ''">
+                      <div class="row">
+                        <div class="col-lg-10 col-md-10 col-sm-10 col-xs-10 repo-panel-title-row">
+                          <span class="repo-icon repo-circle no-background" repo="repository"></span>
+                          <a ng-href="/repository/{{repository.namespace}}/{{ repository.name }}" class="repo-panel-repo-link"
+                             data-repo="{{repository.namespace}}/{{ repository.name }}">
+                             {{ repository.namespace }}/{{ repository.name }}
+                          </a>
+                        </div>
+                        <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                          <i ng-class="repository.is_starred ? 'starred fa fa-star' : 'fa fa-star-o'" class="star-icon" ng-click="toggleStar(repository)"></i>
+                        </div>
                       </div>
-                      <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-                        <i ng-class="repository.is_starred ? 'starred fa fa-star' : 'fa fa-star-o'" class="star-icon" ng-click="toggleStar(repository)"></i>
-                      </div>
-                    </div>
                     <div class="description markdown-view" content="repository.description" first-line-only="true"></div>
-                </div>
-              </div>
-            </div>
-            <div ng-show="namespace.value.length == 0">
-              <div class="empty-primary-msg">This namespace doesn't have any viewable repositories.</div>
-              <div class="empty-secondary-msg">You may be seeing this because you do not have permission to view any repositories. If you have permission, try <a href="/new">creating a new repository</a>.</div>
-            </div>
-
-            <!-- User/Org has no repositories -->
-            <div ng-show="namespace.repositories.value.length == 0" style="padding:20px;">
-              <div class="alert alert-info">
-                <h4 ng-show="namespace == user.username">You don't have any repositories yet!</h4>
-                <h4 ng-show="namespace != user.username">This organization doesn't have any repositories, or you have not been provided access.</h4>
-                <a href="http://docs.quay.io/solution/getting-started.html"><b>Click here</b> to learn how to create a repository</a>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
+          <div ng-show="namespace.repositories.value.length == 0">
+            <div class="empty-primary-msg">This namespace doesn't have any viewable repositories.</div>
+            <div class="empty-secondary-msg">Either no repositories exist yet or you may not have permission to view any. If you have permission, try <a href="/new">creating a new repository</a>.</div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+          <hr>
         </div>
-        <hr>
       </div>
     </div>
   </div>