Fixed issues of phase 2 related to account
merged issues