diff --git a/modules/gui/rocket-info.lua b/modules/gui/rocket-info.lua
index 129b7c73..fc8c8503 100644
--- a/modules/gui/rocket-info.lua
+++ b/modules/gui/rocket-info.lua
@@ -628,4 +628,8 @@ Event.on_nth_tick(150,function()
     end
 end)
 
+--- Makes sure the right buttons are present when role changes
+Event.add(Roles.player_role_assigned,rocket_info 'redraw')
+Event.add(Roles.player_role_unassigned,rocket_info 'redraw')
+
 return rocket_info
\ No newline at end of file
diff --git a/modules/gui/task-list.lua b/modules/gui/task-list.lua
index 9dad2e48..586502e1 100644
--- a/modules/gui/task-list.lua
+++ b/modules/gui/task-list.lua
@@ -406,4 +406,8 @@ Store.register(task_store,function(value,task_id)
     end
 end)
 
+--- Makess sure the right buttons are present when roles change
+Event.add(Roles.player_role_assigned,task_list 'redraw')
+Event.add(Roles.player_role_unassigned,task_list 'redraw')
+
 return task_list
\ No newline at end of file