Fixed account saving
Resolved conflict