bug with username, add staging