Made changes to accountmanager.java