Move password to attributes