diff --git a/src/views/profile.html b/src/views/profile.html
index c9cb6deee..e8deede59 100644
--- a/src/views/profile.html
+++ b/src/views/profile.html
@@ -326,8 +326,8 @@
       <div class="grid-item-top">
           <div class="row">
               <div class="col-xs-4" style="min-width: 150px;">
-                <div class="settings-avatar" ng-click="avatarChange.showChangeAvatar()" style="background-image: url('{{ user.avatarUrl }}');">
-                  <div class="overlay"></div>
+                <div class="settings-avatar" style="background-image: url('{{ user.avatarUrl }}');">
+                  <div class="overlay" ng-click="avatarChange.showChangeAvatar()" ng-hide="config.profileLocked"></div>
                 </div>
               </div>
               <div class="col-xs-8">
@@ -341,19 +341,19 @@
                       <tr>
                           <td class="text-muted" style="vertical-align: top;">Display name</td>
                           <td class="text-right" style="vertical-align: top; white-space: nowrap;">
-                            {{ user.displayName }} <a href="" ng-click="displayNameChange.show()" ng-hide="user.source"><i class="fa fa-edit text-small"></i></a>
+                            {{ user.displayName }} <a href="" ng-click="displayNameChange.show()" ng-hide="user.source || config.profileLocked"><i class="fa fa-edit text-small"></i></a>
                           </td>
                       </tr>
                       <tr>
                           <td class="text-muted" style="vertical-align: top;">Primary email</td>
                           <td class="text-right" style="vertical-align: top; white-space: nowrap;">
-                            {{ user.email }} <a href="" ng-click="emailchange.show()" ng-hide="user.source"><i class="fa fa-edit text-small"></i></a>
+                            {{ user.email }} <a href="" ng-click="emailchange.show()" ng-hide="user.source || config.profileLocked"><i class="fa fa-edit text-small"></i></a>
                           </td>
                       </tr>
                       <tr>
                           <td class="text-muted" style="vertical-align: top;">Password recovery email</td>
                           <td class="text-right" style="vertical-align: top; white-space: nowrap;">
-                            {{ user.fallbackEmail }} <a href="" ng-click="fallbackEmailChange.show()" ng-hide="user.source"><i class="fa fa-edit text-small"></i></a>
+                            {{ user.fallbackEmail }} <a href="" ng-click="fallbackEmailChange.show()" ng-hide="user.source || config.profileLocked"><i class="fa fa-edit text-small"></i></a>
                           </td>
                       </tr>
                       <tr>