Fixing flow for no user id