solve some bugs, deactivate email, add encrypted password into account file
solve conflict