Fixing flow with users