diff --git a/users/templates/users/profile.html b/users/templates/users/profile.html
index 2ff9b5f..e75cce2 100644
--- a/users/templates/users/profile.html
+++ b/users/templates/users/profile.html
@@ -11,12 +11,6 @@
 
 {% endblock %}
 
-{% block menu %}
-  {% if user|has_role:'system_admin' %}
-	 <li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
-  {% endif %}
-{% endblock %}
-
 {% block content %}
 	{% if messages %}
 		{% for message in messages %}
diff --git a/users/views.py b/users/views.py
index 1b126b7..1702884 100644
--- a/users/views.py
+++ b/users/views.py
@@ -47,7 +47,7 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
 
 	def get_context_data (self, **kwargs):
 		context = super(UsersListView, self).get_context_data(**kwargs)
-		context['title'] = 'Manage Users'
+		context['title'] = 'Manage Users | Amadeus'
 		return context
 
 class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
@@ -72,12 +72,12 @@ class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
 
 		self.object.save()
 
-		messages.success(self.request, _('User ')+self.object.name+_(' created successfully!'))
+		messages.success(self.request, ('User ')+self.object.name+(' created successfully!'))
 
 		return super(Create, self).form_valid(form)
 	def get_context_data (self, **kwargs):
 		context = super(Create, self).get_context_data(**kwargs)
-		context['title'] = _("Add User")
+		context['title'] = "Add User | Amadeus"
 		return context
 
 class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
@@ -109,6 +109,11 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
 
 		return super(Update, self).form_valid(form)
 
+	def get_context_data (self, **kwargs):
+		context = super(Update, self).get_context_data(**kwargs)
+		context['title'] = "Update User | Amadeus"
+		return context
+
 class View(LoginRequiredMixin, generic.DetailView):
 
 	login_url = reverse_lazy("core:home")
@@ -119,6 +124,11 @@ class View(LoginRequiredMixin, generic.DetailView):
 	slug_field = 'username'
 	slug_url_kwarg = 'username'
 
+	def get_context_data (self, **kwargs):
+		context = super(View, self).get_context_data(**kwargs)
+		context['title'] = "User | Amadeus"
+		return context
+
 def delete_user(request,username):
 	user = get_object_or_404(User,username = username)
 	user.delete()
@@ -134,6 +144,11 @@ def remove_account(request,username):
 class Change_password(generic.TemplateView):
 	template_name = 'users/change_password.html'
 
+	def get_context_data (self, **kwargs):
+		context = super(Change_password, self).get_context_data(**kwargs)
+		context['title'] = "Change Password | Amadeus"
+		return context
+
 class Remove_account(generic.TemplateView):
 	template_name = 'users/remove_account.html'
 
@@ -150,6 +165,7 @@ class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
 
 	def get_context_data(self, **kwargs):
 		context = super(UpdateProfile, self).get_context_data(**kwargs)
+		context['title'] = 'Update Profile | Amadeus'
 		if has_role(self.request.user, 'system_admin'):
 			context['form'] = UpdateProfileFormAdmin(instance = self.object)
 		else:
@@ -184,6 +200,12 @@ class Profile(LoginRequiredMixin, generic.DetailView):
 	def get_object(self):
 		user = get_object_or_404(User, username = self.request.user.username)
 		return user
+
+	def get_context_data (self, **kwargs):
+		context = super(Profile, self).get_context_data(**kwargs)
+		context['title'] = "Profile | Amadeus"
+		return context
+
 class SearchView(LoginRequiredMixin, generic.ListView):
 
 	login_url = reverse_lazy("core:home")
--
libgit2 0.21.2