Activity and Password Fixes