diff --git a/static/css/quay.css b/static/css/quay.css
index f095d275d..7cf6ed02a 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -4107,10 +4107,6 @@ pre.command:before {
   margin-top: 10px;
 }
 
-.trigger-option-section .entity-search-element .twitter-typeahead {
-  width: 370px;
-}
-
 .trigger-option-section .entity-search-element input {
   width: 100%;
 }
diff --git a/static/directives/setup-trigger-dialog.html b/static/directives/setup-trigger-dialog.html
index 9efb9300e..07158c5db 100644
--- a/static/directives/setup-trigger-dialog.html
+++ b/static/directives/setup-trigger-dialog.html
@@ -45,47 +45,58 @@
               </div>
             </div>
 
-            <table style="width: 100%;" ng-show="pullRequirements">
-              <tr>
-                <td style="width: 114px">
-                  <div class="context-tooltip" data-title="The credentials used by the builder when pulling images from Quay.io" bs-tooltip>
-                    Pull Credentials:
-                  </div>
-                </td>
-                <td>
-                  <div ng-if="!isNamespaceAdmin(repository.namespace)" style="color: #aaa;">
-                    In order to set pull credentials for a build trigger, you must be an Administrator of the namespace <strong>{{ repository.namespace }}</strong>
-                  </div>
-                  <div class="btn-group btn-group-sm" ng-if="isNamespaceAdmin(repository.namespace)">
-                    <button type="button" class="btn btn-default"
-                            ng-class="publicPull ? 'active btn-info' : ''" ng-click="setPublicPull(true)">Public</button>
-                    <button type="button" class="btn btn-default"
-                            ng-class="publicPull ? '' : 'active btn-info'" ng-click="setPublicPull(false)">
-                      <i class="fa fa-wrench"></i>
-                      Robot account
-                    </button>
-                  </div>
-                </td>
-              </tr>
-              <tr ng-show="!publicPull">
-                <td>                  
-                </td>
-                <td>
-                  <div class="entity-search" namespace="repository.namespace"                       
-                       placeholder="'Select robot account for pulling...'"                       
-                       current-entity="pullEntity"
-                       allowed-entities="['robot']"></div>
+            <div ng-show="pullRequirements">
+              <table style="width: 100%;">
+                <tr>
+                  <td style="width: 162px">
+                    <span class="context-tooltip" data-title="The credentials given to 'docker pull' in the builder for pulling images"
+                          style="margin-bottom: 10px" bs-tooltip>
+                      docker pull Credentials:
+                    </span>
+                  </td>
+                  <td>
+                    <div ng-if="!isNamespaceAdmin(repository.namespace)" style="color: #aaa;">
+                      In order to set pull credentials for a build trigger, you must be an Administrator of the namespace <strong>{{ repository.namespace }}</strong>
+                    </div>
+                    <div class="btn-group btn-group-sm" ng-if="isNamespaceAdmin(repository.namespace)">
+                      <button type="button" class="btn btn-default"
+                              ng-class="publicPull ? 'active btn-info' : ''" ng-click="setPublicPull(true)">None</button>
+                      <button type="button" class="btn btn-default"
+                              ng-class="publicPull ? '' : 'active btn-info'" ng-click="setPublicPull(false)">
+                        <i class="fa fa-wrench"></i>
+                        Robot account
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              </table>
+
+              <table style="width: 100%;">
+                <tr ng-show="!publicPull">
+                  <td>
+                    <div class="entity-search" namespace="repository.namespace"                       
+                         placeholder="'Select robot account for pulling...'"                       
+                         current-entity="pullEntity"
+                         allowed-entities="['robot']"></div>
+
+                    <div class="alert alert-info" ng-if="pullRequirements.status == 'analyzed' && pullRequirements.robots.length"
+                         style="margin-top: 20px; margin-bottom: 0px;">
+                      Note: We've automatically selected robot account
+                      <span class="entity-reference" entity="pullRequirements.robots[0]"></span>, since it has access to the Quay.io
+                      repository.
+                    </div>
+                    <div class="alert alert-warning"
+                         ng-if="pullRequirements.status == 'analyzed' && !pullRequirements.robots.length && pullRequirements.name"
+                         style="margin-top: 20px; margin-bottom: 0px;">
+                      Note: No robot account currently has access to the Quay.io repository. Please create one and/or assign access in the
+                      <a href="/repository/{{ pullRequirements.namespace }}/{{ pullRequirements.name }}/admin" target="_blank">repository's
+                        admin panel</a>.
+                    </div>
+                  </td>
+                </tr>
+              </table>
+            </div>
 
-                  <div class="alert alert-info" ng-if="pullRequirements.robots.length" style="margin-top: 20px; margin-bottom: 0px;">
-                    Note: We've automatically selected robot account <span class="entity-reference" entity="pullRequirements.robots[0]"></span>, since it has access to the Quay.io repository.
-                  </div>
-                  <div class="alert alert-warning" ng-if="!pullRequirements.robots.length" style="margin-top: 20px; margin-bottom: 0px;">
-                    Note: No robot account currently has access to the Quay.io repository. Please create one and/or assign access in the
-                    <a href="/repository/{{ pullRequirements.namespace }}/{{ pullRequirements.name }}/admin" target="_blank">repository's admin panel</a>.
-                  </div>
-                </td>
-              </tr>
-            </table>
           </div>
 
         </div>