diff --git a/apps/applications/templates/applications/terminal_list.html b/apps/applications/templates/applications/terminal_list.html
index b6cb70635..fa0f32396 100644
--- a/apps/applications/templates/applications/terminal_list.html
+++ b/apps/applications/templates/applications/terminal_list.html
@@ -81,9 +81,15 @@ $(document).ready(function(){
                 var connect_btn = '<a href="{% url "applications:terminal-connect" pk=99991937 %}"" class="btn btn-xs btn-warning btn-connect" >{% trans "Connect" %}</a> '
                         .replace('99991937', cellData);
                 if (rowData.is_accepted) {
-                    $(td).html(connect_btn + update_btn + delete_btn)
+                    {% if user.is_superuser %}
+                    $(td).html(connect_btn + update_btn + delete_btn);
+                    {% else %}
+                    $(td).html(connect_btn);
+                    {% endif %}
                 } else {
-                    $(td).html(accept_btn + reject_btn)
+                    {% if user.is_superuser %}
+                    $(td).html(accept_btn + reject_btn);
+                    {% endif %}
                 }
              }}
         ],
diff --git a/apps/media/avatar/default.png b/apps/media/avatar/default.png
new file mode 100644
index 000000000..0d07dbf97
Binary files /dev/null and b/apps/media/avatar/default.png differ
diff --git a/apps/media/avatar/default/default1.png b/apps/media/avatar/default/default1.png
deleted file mode 100644
index b90e5efd7..000000000
Binary files a/apps/media/avatar/default/default1.png and /dev/null differ
diff --git a/apps/media/avatar/default/default2.png b/apps/media/avatar/default/default2.png
deleted file mode 100644
index 5afa17403..000000000
Binary files a/apps/media/avatar/default/default2.png and /dev/null differ
diff --git a/apps/media/avatar/default/default3.png b/apps/media/avatar/default/default3.png
deleted file mode 100644
index e13e00c70..000000000
Binary files a/apps/media/avatar/default/default3.png and /dev/null differ
diff --git a/apps/media/avatar/default/default4.png b/apps/media/avatar/default/default4.png
deleted file mode 100644
index 213295c9c..000000000
Binary files a/apps/media/avatar/default/default4.png and /dev/null differ
diff --git a/apps/media/avatar/default/default5.png b/apps/media/avatar/default/default5.png
deleted file mode 100644
index 1893c0aea..000000000
Binary files a/apps/media/avatar/default/default5.png and /dev/null differ
diff --git a/apps/media/avatar/default/default6.png b/apps/media/avatar/default/default6.png
deleted file mode 100644
index 448775e55..000000000
Binary files a/apps/media/avatar/default/default6.png and /dev/null differ
diff --git a/apps/templates/_user_profile.html b/apps/templates/_user_profile.html
index 0e6e2c8f1..a2da99d33 100644
--- a/apps/templates/_user_profile.html
+++ b/apps/templates/_user_profile.html
@@ -16,8 +16,8 @@
             </span>
         </a>
         <ul class="dropdown-menu animated fadeInRight m-t-xs">
-            <li><a value="">{% trans 'Profile' %}</a></li>
-            <li><a value="">{% trans 'Profile settings' %}</a></li>
+            <li><a href="{% url 'users:user-profile' %}">{% trans 'Profile' %}</a></li>
+            <li><a href="{% url 'users:user-profile-update' %}">{% trans 'Profile settings' %}</a></li>
             <li class="divider"></li>
             <li><a href="">{% trans 'Logout' %}</a></li>
         </ul>
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 4add92814..0aaa8163f 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -183,11 +183,9 @@ class User(AbstractUser):
         if self.avatar:
             return self.avatar.url
         else:
-            default_dir = os.path.join(settings.MEDIA_ROOT, 'avatar', 'default')
-            if os.path.isdir(default_dir):
-                default_avatar_list = os.listdir(default_dir)
-                default_avatar = default_avatar_list[len(self.username) % len(default_avatar_list)]
-                return os.path.join(settings.MEDIA_URL, 'avatar', 'default',  default_avatar)
+            avatar_dir = os.path.join(settings.MEDIA_ROOT, 'avatar')
+            if os.path.isdir(avatar_dir):
+                return os.path.join(settings.MEDIA_URL, 'avatar', 'default.png')
         return 'https://www.gravatar.com/avatar/c6812ab450230979465d7bf288eadce2a?s=120&d=identicon'
 
     def generate_reset_token(self):