diff --git a/app/controllers/admin/module_store_controller.rb b/app/controllers/admin/module_store_controller.rb
index 86ab188..0644f24 100644
--- a/app/controllers/admin/module_store_controller.rb
+++ b/app/controllers/admin/module_store_controller.rb
@@ -2,7 +2,13 @@ class Admin::ModuleStoreController < OrbitBackendController
 
   def index
     if get_site.site_token?
-      @extensions = get_extensions
+      if get_site.store_confirmation
+        @extensions = get_extensions
+        @store_confirmation = true
+      else
+        @extensions = []
+        @store_confirmation = false
+      end
       @downloaded_extensions = get_downloaded_extension
     else
        @extensions = []
diff --git a/app/controllers/admin/template_store_controller.rb b/app/controllers/admin/template_store_controller.rb
index 5bc8d93..d16d24f 100644
--- a/app/controllers/admin/template_store_controller.rb
+++ b/app/controllers/admin/template_store_controller.rb
@@ -8,9 +8,13 @@ class Admin::TemplateStoreController < OrbitBackendController
   def index
     @site = Site.first
     if @site.site_token?
-      @design_ids = Design.all.map{|d| d.template_store_id}
-      @templates = get_templates.parsed_response
-      render :layout => false
+      if @site.store_confirmation
+        @design_ids = Design.all.map{|d| d.template_store_id}
+        @templates = get_templates.parsed_response
+        render :layout => false
+      else
+         render :partial => "admin/site_registration/not_confirmed_store"
+      end
     else
       render :partial => "admin/site_registration/site_registration"
     end
diff --git a/app/views/admin/module_store/index.html.erb b/app/views/admin/module_store/index.html.erb
index 15ced10..af7e652 100644
--- a/app/views/admin/module_store/index.html.erb
+++ b/app/views/admin/module_store/index.html.erb
@@ -185,7 +185,11 @@
         <div class="panel-heading"><i class="icon-shopping-cart"></i><span class="break"></span><%= t(:module_store) %></div>
         <div class="pannel-body">
         <% if @extensions.empty? %>
-        <%= render :partial => "admin/site_registration/site_registration" %>
+          <% if @store_confirmation %>
+           <%= render :partial => "admin/site_registration/site_registration" %>
+          <% else %>
+            <%= render :partial => "admin/site_registration/not_confirmed_store" %>
+          <% end %>
         <% else %>
           <table id="mt-list" class="table main-list">
             <thead>
diff --git a/app/views/admin/site_registration/_not_confirmed_store.html.erb b/app/views/admin/site_registration/_not_confirmed_store.html.erb
new file mode 100644
index 0000000..e5b88d8
--- /dev/null
+++ b/app/views/admin/site_registration/_not_confirmed_store.html.erb
@@ -0,0 +1 @@
+Admin email has not been confirmed. Please confirm your email first and try again.
\ No newline at end of file