Seems like this should also be in the authentication module.