username fix, adding temporary dev/prod handling