commercial user setup and small modal fix