Separate modules for authentication and authorisation
Uh, give the second head a chance to match.
Placate Matthias.
Merge bug25654