Fix - make sure we use correct username _everywhere_