diff --git a/make_post_sell/views/shop.py b/make_post_sell/views/shop.py
index 986dd98..882ae34 100644
--- a/make_post_sell/views/shop.py
+++ b/make_post_sell/views/shop.py
@@ -161,7 +161,9 @@ def shop_new(request):
                 shop.add_user_to_shop(request.user, default=True)
             else:
                 shop.add_user_to_shop(request.user)
+            request.user.set_active_shop(shop)
             request.dbsession.add(shop)
+            request.dbsession.add(request.user)
             request.dbsession.flush()
             msg = ("Great work, you created a shop! You may continue to setup your shop or start posting products!", "success")
             request.session.flash(msg)