Core pr 5

Fixed some user redirects and coding style.
What I can do now is to create a ticket with the issue, as it's outside the time frame given to this review. The role name gives meaning in the administration interface (e.g permission pages etc.).