diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php
index 3ab064c..067f449 100644
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -151,9 +151,10 @@ class TeamStoreController extends Controller {
 
 	public function checkTeamStorePassword(Request $request)
 	{
-		$m 		= new TeamStoreModel;
-		$post 	=	$request->all();
-		$store_array 	= $m->selectTeamStore('Password', $post['password']);
+		$m 				= 	new TeamStoreModel;
+		$post 			=	$request->all();
+		
+		$store_array 	= $m->checkStorePassword($post['store_id'], $post['password']);
 
 		if($store_array){
 			$request->session()->put('teamstore_data_array', $store_array);
diff --git a/app/Models/teamstore/TeamStoreModel.php b/app/Models/teamstore/TeamStoreModel.php
index b8545c2..7f2bf01 100644
--- a/app/Models/teamstore/TeamStoreModel.php
+++ b/app/Models/teamstore/TeamStoreModel.php
@@ -39,6 +39,15 @@ class TeamStoreModel extends Model {
         return $i;
 	}
 
+	function checkStorePassword($storeid, $password) 
+	{
+		$i = DB::table('teamstores')
+						->where('Id', $storeid)
+						->where('Password', $password)
+						->get();
+        return $i;
+	}
+
 	function selectTeamStoreGroupByCartKey($cartKey)
 	{
 		$i = DB::table('cart_tmp')
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index 101e5da..62b0578 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -147,6 +147,8 @@
 
 			$('.password-protected').click(function(){
 
+				$('#_teamstore_id').val($(this).data('store-id'))
+				// console.log($(this).data('store-id'))
 				$('#team-store-login').modal('show')
 				return false;
 
diff --git a/resources/views/teamstore-sublayouts/login.blade.php b/resources/views/teamstore-sublayouts/login.blade.php
index 6e4a722..98c01b8 100644
--- a/resources/views/teamstore-sublayouts/login.blade.php
+++ b/resources/views/teamstore-sublayouts/login.blade.php
@@ -15,7 +15,6 @@
 							<strong>Whoops!</strong> {!! \Session::get('errors') !!}.<br><br>
 						</div>
 					@endif
-
 					<form class="form-horizontal" role="form" method="POST" action="teamstore/checkpassword">
 						<input type="hidden" name="_token" value="{{ csrf_token() }}">
 
diff --git a/resources/views/teamstore-sublayouts/stores.blade.php b/resources/views/teamstore-sublayouts/stores.blade.php
index a296aa1..aade5c5 100644
--- a/resources/views/teamstore-sublayouts/stores.blade.php
+++ b/resources/views/teamstore-sublayouts/stores.blade.php
@@ -81,7 +81,7 @@
             <li class="li-custom col-lg-3 col-md-3 col-sm-4 col-xs-12">
                 <div style="border: 1px solid #dddddd; padding: 5px;">
                     @if($store->Password != null )
-                        <a class="thumbnail password-protected" href="#" data-store-url="{{  $store->StoreUrl }}">
+                        <a class="thumbnail password-protected" href="#" data-store-id="{{  $store->Id }}" data-store-url="{{  $store->StoreUrl }}">
                             <img class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/'. $store->ImageFolder . '/' . $store->StoreLogo  }}">
                         </a>
                         <h4  style="border-top: 1px solid #dddddd; padding: 10px; font-size: 16px; font-weight: bold; text-transform: uppercase;" class="text-center">{{  $store->StoreName }}  <i class="fa fa-lock" title="This store is password protected."></i></h4>
@@ -124,11 +124,12 @@
 
             <form class="form-horizontal" role="form" method="POST" action="{{ url('teamstore/checkpassword') }}">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
-
+                <input type="hidden" class="form-control" id="_teamstore_id" name="store_id">
                 <div class="form-group">
                     <label class="col-md-4 control-label">Password</label>
                     <div class="col-md-6">
                         <div class="input-group">
+                            
                             <input type="password" class="form-control pwd" name="password">
                             <span class="input-group-btn">
                                 <button class="btn btn-default reveal-password" type="button"><i class="fa fa-eye"></i></button>