Merge Authentication controller with Users controller