diff --git a/main/views.py b/main/views.py
index 0008255..3ec1319 100644
--- a/main/views.py
+++ b/main/views.py
@@ -135,7 +135,7 @@ def work_page(request, id):
         for user in users:
 
             if user.custom_role_id == ZENDESK_ROLES['engineer']:
-                engineers.append((user))
+                engineers.append(user)
             elif user.custom_role_id == ZENDESK_ROLES['light_agent']:
                 light_agents.append(user)
 
@@ -151,8 +151,9 @@ def work_page(request, id):
 @login_required()
 def work_hand_over(request):
     zenpy_user, admin = auth_user(request)
-    if zenpy_user.role == "admin" or zenpy_user.role == "end-user":
-        zenpy_user.role = "agent"
+
+    if zenpy_user.custom_role_id == ZENDESK_ROLES['engineer']:
+        zenpy_user.custom_role_id = ZENDESK_ROLES['light_agent']
         admin.users.update(zenpy_user)
         request.user.userprofile.role = "agent"
         request.user.userprofile.save()
@@ -162,10 +163,10 @@ def work_hand_over(request):
 @login_required()
 def work_become_engineer(request):
     zenpy_user, admin = auth_user(request)
-    if zenpy_user.role == "agent" or zenpy_user.role == "end-user":
-        zenpy_user.role = "admin"
+    if zenpy_user.custom_role_id == ZENDESK_ROLES['light_agent']:
+        zenpy_user.custom_role_id = ZENDESK_ROLES['engineer']
         admin.users.update(zenpy_user)
-        request.user.userprofile.role = "admin"
+        request.user.userprofile.role = "agent"
         request.user.userprofile.save()
     return HttpResponseRedirect(reverse('work', args=(request.user.id,)))