Added better handling of the same user across multiple tabs