Refactored creating of account server