diff --git a/public/app/features/org/partials/profile.html b/public/app/features/org/partials/profile.html
index c51c3750ee5..7f52fbbd9d1 100644
--- a/public/app/features/org/partials/profile.html
+++ b/public/app/features/org/partials/profile.html
@@ -9,18 +9,20 @@
 	<form name="ctrl.userForm" class="gf-form-group">
 		<h3 class="page-heading">Information</h3>
 
-		<div class="gf-form">
-			<span class="gf-form-label width-9">Name</span>
-			<input class="gf-form-input max-width-21" type="text" required ng-model="ctrl.user.name" >
-		</div>
-		<div class="gf-form">
-			<span class="gf-form-label width-9">Email</span>
-			<input class="gf-form-input max-width-21" type="email" required ng-model="ctrl.user.email">
-		</div>
-		<div class="gf-form">
-			<span class="gf-form-label width-9">Username</span>
-			<input class="gf-form-input max-width-21" type="text" required ng-model="ctrl.user.login">
+		<div class="gf-form max-width-30">
+			<span class="gf-form-label width-8">Name</span>
+			<input class="gf-form-input max-width-22" type="text" required ng-model="ctrl.user.name" >
 		</div>
+		<div class="gf-form max-width-30">
+			<span class="gf-form-label width-8">Email</span>
+			<input class="gf-form-input max-width-22" type="email" ng-readonly="ctrl.readonlyLoginFields" required ng-model="ctrl.user.email">
+      <i ng-if="ctrl.readonlyLoginFields" class="fa fa-lock gf-form-icon--right-absolute" bs-tooltip="'Login Details Locked - managed in another system.'"></i>
+    </div>
+		<div class="gf-form max-width-30">
+			<span class="gf-form-label width-8">Username</span>
+      <input class="gf-form-input max-width-22" type="text" ng-readonly="ctrl.readonlyLoginFields" required ng-model="ctrl.user.login">
+      <i ng-if="ctrl.readonlyLoginFields" class="fa fa-lock gf-form-icon--right-absolute" bs-tooltip="'Login Details Locked - managed in another system.'"></i>
+    </div>
 		<div class="gf-form-button-row">
 			<button type="submit" class="btn btn-success" ng-click="ctrl.update()">Update</button>
 		</div>
diff --git a/public/app/features/org/profile_ctrl.ts b/public/app/features/org/profile_ctrl.ts
index c0e8b5ae246..4687218826c 100644
--- a/public/app/features/org/profile_ctrl.ts
+++ b/public/app/features/org/profile_ctrl.ts
@@ -10,6 +10,7 @@ export class ProfileCtrl {
   orgs: any = [];
   userForm: any;
   showOrgsList = false;
+  readonlyLoginFields = config.disableLoginForm;
 
   /** @ngInject **/
   constructor(private backendSrv, private contextSrv, private $location) {
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index 25db63858e8..370a5db943a 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -85,6 +85,5 @@
 @import "pages/signup";
 @import "pages/styleguide";
 
-
 @import "old_responsive";
 @import "components/view_states.scss";
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 19588634dd3..94691334fe2 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -286,3 +286,10 @@ $gf-form-margin: 0.25rem;
 select.gf-form-input ~ .gf-form-help-icon {
   right: 10px;
 }
+
+.gf-form-icon--right-absolute {
+  position: absolute;
+  right: $spacer;
+  top: 10px;
+  color: $text-muted;
+}