Changes for pw as db field, update is borked atm