handle non-logged in users properly. fixes #2