Do we want to add this to the authentication module?