Make controller more intelligent and handle account changes