Fix - make sure we use correct username if there's custom username set for the environment