diff --git a/common/models.py b/common/models.py
index 41fad5f3..04b66410 100644
--- a/common/models.py
+++ b/common/models.py
@@ -37,6 +37,9 @@ class User(AbstractBaseUser, PermissionsMixin):
     def __unicode__(self):
         return self.email
 
+    class Meta:
+        ordering = ['-is_active']
+
 
 class Address(models.Model):
     address_line = models.CharField(_("Address"), max_length=255, blank=True, null=True)
diff --git a/common/templates/create.html b/common/templates/create.html
index 196cef53..fa278316 100644
--- a/common/templates/create.html
+++ b/common/templates/create.html
@@ -51,7 +51,7 @@
                 </div>
                 <span class="error" id="id_email">{{ errors.email }}</span>
               </div>
-              <div class="filter_col col-md-12" {% if request.user.role != 'ADMIN' and not request.user.is_superuser %}style="display:none;"{% endif %}>
+              <div class="filter_col col-md-12" {% if request.user.role != 'ADMIN' and not request.user.is_superuser or request.user.id == user_obj.id %}style="display:none;"{% endif %}>
                   <div class="form-group">
                     <label for="id_role">User Role{% if user_form.role.field.required %}<span class="error">*</span>{% endif %}</label>
                     {% if request.user.role == 'ADMIN' or request.user.is_superuser %}
diff --git a/common/templates/list.html b/common/templates/list.html
index 705ce782..850d453c 100644
--- a/common/templates/list.html
+++ b/common/templates/list.html
@@ -96,19 +96,20 @@
                     <td>{{ user.username }}</td>
                     <td>{{ user.email }}</td>
                     <td>{% if user.is_superuser %} ADMIN {% else %} {{user.role}} {% endif %}</td>
-                    <td>
+                    <td><a href="{% url 'common:change_user_status' pk=user.id %}" class="on_off" style="color: #454545; text-decoration: none;">
                       {% if user.is_active == True %}
-                        Active
+                        <i class="fa fa-toggle-on"></i> Active
                       {% else %}
-                        InActive
+                        <i class="fa fa-toggle-off"></i> InActive
                       {% endif %}
+                    </a>
                     </td>
                     <td class="actions">
                       <!-- <a href="{% url 'common:view_user' user.id %}" class="btn btn-info view"><i class="fas fa-eye"></i>View</a> -->
                       {% if user.email != admin_email  or request.user.email == admin_email %}
                       <a href="{% url 'common:edit_user' user.id %}" class="btn btn-success edit"><i class="fas fa-pencil-alt"></i>Edit</a>
                       {% endif %}
-                      <a href="{% url 'common:remove_user' user.id %}" class="btn btn-danger trash" {% if request.user.email == user.email or user.role == "ADMIN"  or user.is_superuser %} style="visibility: hidden;" {% endif %}><i class="fas fa-trash-alt"></i>Delete</a>
+                      <a href="{% url 'common:remove_user' user.id %}" class="btn btn-danger trash" {% if request.user.email == user.email %} style="visibility: hidden;" {% endif %}><i class="fas fa-trash-alt"></i>Delete</a>
                     </td>
                   </tr>
                   {% endfor %}
diff --git a/common/urls.py b/common/urls.py
index a7954ffe..6e6715b2 100644
--- a/common/urls.py
+++ b/common/urls.py
@@ -5,7 +5,7 @@ from common.views import (
     HomeView, LoginView, ForgotPasswordView, LogoutView, ChangePasswordView, ProfileView,
     UsersListView, CreateUserView, UpdateUserView, UserDetailView, UserDeleteView, PasswordResetView,
     DocumentListView, DocumentCreateView, UpdateDocumentView, DocumentDetailView, DocumentDeleteView, 
-    download_document)
+    download_document, change_user_status)
 from django.conf.urls.static import static
 from django.conf import settings
 
@@ -45,4 +45,7 @@ urlpatterns = [
     # download
     path('documents/<int:pk>/download/', download_document, name='download_document'),
 
+    path('user/status/<int:pk>/', change_user_status, name='change_user_status'),
+
+
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/common/views.py b/common/views.py
index 93ba51ce..c4ce2eb3 100644
--- a/common/views.py
+++ b/common/views.py
@@ -359,4 +359,14 @@ def download_document(request, pk):
             response = HttpResponse(fh.read(), content_type="application/vnd.ms-excel")
             response['Content-Disposition'] = 'inline; filename=' + os.path.basename(file_path)
             return response
-    raise Http404
\ No newline at end of file
+    raise Http404
+
+
+def change_user_status(request, pk):
+    user = get_object_or_404(User, pk=pk)
+    if user.is_active:
+        user.is_active = False
+    else:
+        user.is_active = True
+    user.save()
+    return HttpResponseRedirect('/users/list/')
diff --git a/templates/profile.html b/templates/profile.html
index 25f2d39d..a897e83d 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -55,7 +55,7 @@
                     <img src="{{ im.url }}">
                     {% endthumbnail %}
                   {% else %}
-                  <img src="https://cdn.dribbble.com/users/99875/screenshots/4353558/2018-03-01biker_site-2.gif" />
+                  <img src="{% static 'images/user.png' %}" alt="Micro profile pic" />
                   {% endif %}
                 </div>
               </div>