diff --git a/static/directives/docker-auth-dialog.html b/static/directives/docker-auth-dialog.html
index b7a414725..33b4af8cd 100644
--- a/static/directives/docker-auth-dialog.html
+++ b/static/directives/docker-auth-dialog.html
@@ -20,9 +20,10 @@
            <a href="javascript:void(0)" ng-click="downloadCfg(shownRobot)">Download .dockercfg file</a>
          </span>
          <div class="clipboard-copied-message" style="display: none">
-           Copied to clipboard
+           Copied
          </div>
-         <button id="copyClipboard" type="button" class="btn btn-primary" data-clipboard-target="token-view">Copy to clipboard</button>
+         <input type="hidden" name="command-data" id="command-data" value="{{ command }}">
+         <button id="copyClipboard" type="button" class="btn btn-primary" data-clipboard-target="command-data">Copy Login Command</button>
          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
        </div>
      </div><!-- /.modal-content -->
diff --git a/static/js/app.js b/static/js/app.js
index 250665f60..aa9d8bcba 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -2383,7 +2383,15 @@ quayApp.directive('dockerAuthDialog', function (Config) {
       'shown': '=shown',
       'counter': '=counter'
     },
-    controller: function($scope, $element) {     
+    controller: function($scope, $element) {
+      var updateCommand = function() {
+        $scope.command = 'docker login -e="." -u="' + $scope.username +
+          '" -p="' + $scope.token + '" ' + Config['SERVER_HOSTNAME'];
+      };
+
+      $scope.$watch('username', updateCommand);
+      $scope.$watch('token', updateCommand);
+
       $scope.isDownloadSupported = function() {
         var isSafari = /^((?!chrome).)*safari/i.test(navigator.userAgent);
         if (isSafari) {