Fix for making old created shops not to break system
Improved user experience when login and subscribing