Now works with or without login