Added my changes to master, I have a test activity for Set Password
button. I didn't want to add it before, but I figured now that I should
so as to keep my version and the master version the same....