Fixed bug where I was doing password dependent addressing early