diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html
index ca5231186..15bd05ce7 100644
--- a/static/directives/header-bar.html
+++ b/static/directives/header-bar.html
@@ -44,7 +44,7 @@
 
         <!-- Normal -->
         <ul class="nav navbar-nav navbar-right hidden-xs" ng-switch on="user.anonymous">
-          <li class="new-ui-toggle" ng-if="Features.UI_V2">
+          <li class="new-ui-toggle" ng-if="Features.UI_V2 && !checkElementByID('signin-username')">
               <new-ui-toggle></new-ui-toggle>
           </li>
           <li>
diff --git a/static/js/directives/ui/header-bar.js b/static/js/directives/ui/header-bar.js
index 284b3027e..e63726875 100644
--- a/static/js/directives/ui/header-bar.js
+++ b/static/js/directives/ui/header-bar.js
@@ -145,6 +145,14 @@ angular.module('quay').directive('headerBar', function () {
           'namespace': namespace
         };
       };
+
+      $scope.checkElementByID = function(elementID) {
+        var result = false;
+        if (document.getElementById(elementID)) {
+          result = true;
+        }
+        return result;
+      }
     }
   };
   return directiveDefinitionObject;