diff --git a/public/app/panels/singlestat/module.js b/public/app/panels/singlestat/module.js
index 3c698bfd553..24855634ba6 100644
--- a/public/app/panels/singlestat/module.js
+++ b/public/app/panels/singlestat/module.js
@@ -190,7 +190,12 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
         data.flotpairs = $scope.series[0].flotpairs;
       }
 
-      // first check value to text mappings
+      var decimalInfo = $scope.getDecimalsForValue(data.value);
+      var formatFunc = kbn.valueFormats[$scope.panel.format];
+      data.valueFormated = formatFunc(data.value, decimalInfo.decimals, decimalInfo.scaledDecimals);
+      data.valueRounded = kbn.roundValue(data.value, decimalInfo.decimals);
+
+      // check value to text mappings
       for(var i = 0; i < $scope.panel.valueMaps.length; i++) {
         var map = $scope.panel.valueMaps[i];
         // special null case
@@ -201,6 +206,7 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
           }
           continue;
         }
+
         // value/number to text mapping
         var value = parseFloat(map.value);
         if (value === data.value) {
@@ -212,11 +218,6 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
       if (data.value === null || data.value === void 0) {
         data.valueFormated = "no value";
       }
-
-      var decimalInfo = $scope.getDecimalsForValue(data.value);
-      var formatFunc = kbn.valueFormats[$scope.panel.format];
-      data.valueFormated = formatFunc(data.value, decimalInfo.decimals, decimalInfo.scaledDecimals);
-      data.valueRounded = kbn.roundValue(data.value, decimalInfo.decimals);
     };
 
     $scope.removeValueMap = function(map) {
diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 8db858dac8d..437588dd652 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -19,7 +19,7 @@
       <form name="loginForm" class="login-form">
         <div class="tight-form" ng-if="loginMode">
           <ul class="tight-form-list">
-            <li class="tight-form-item" style="width: 80px">
+            <li class="tight-form-item" style="width: 78px">
 							<strong>User</strong>
             </li>
             <li>
@@ -30,7 +30,7 @@
         </div>
         <div class="tight-form" ng-if="loginMode">
           <ul class="tight-form-list">
-            <li class="tight-form-item" style="width: 80px">
+            <li class="tight-form-item" style="width: 78px">
 							<strong>Password</strong>
             </li>
             <li>