Cleaned up account handling