Refactored and got rid of account switching bug