Index: app/Http/Controllers/SessionsController.php
===================================================================
--- app/Http/Controllers/SessionsController.php	(revision 768f47335966ba1c9293c4e78941c76edd43c239)
+++ app/Http/Controllers/SessionsController.php	(revision 69e9f5d8874036fc0e762d24b9230b483309e09b)
@@ -19,14 +19,17 @@
         $password = $credentials['password'];
         $badge_no = $credentials['badge_no'];
+        // mozhe da se najavi kako policaec i kako officer, znaeme koj e koj po znachkata
+
         $policeman = true;
-        $exists = DB::select('select * from policeman where badge_no = :badge_no;', ['badge_no' => $badge_no]);
-        $pass = DB::select('select p_password from policeman where badge_no = :badge_no;', ['badge_no' => $badge_no]);
-        if($exists == null) {
-            $exists = DB::select('select * from officer where o_badge_no = :badge_no;', ['badge_no' => $badge_no]);
-            $pass = DB::select('select o_password from officer where o_badge_no = :badge_no;', ['badge_no' => $badge_no]);
+        $is_policeman = DB::select('select * from policeman where badge_no = :badge_no;', ['badge_no' => $badge_no]);
+        $is_officer = DB::select('select * from officer where o_badge_no = :badge_no;', ['badge_no' => $badge_no]);
+        if($is_officer==null && $is_policeman==null) {
+            return back()->withErrors(['password' => 'Invalid credentials']);
+        }
+        if($is_officer!=null) {
+            $pass = DB::select('select o_password from officer where o_badge_no = :o_badge_no;', ['o_badge_no' => $badge_no]);
             $policeman = false;
-        }
-        if($exists == null) {
-            return back()->withErrors(['badge_no' => 'Invalid badge_no']);
+        } else {
+            $pass = DB::select('select p_password from policeman where badge_no = :badge_no;', ['badge_no' => $badge_no]);
         }
 
@@ -36,5 +39,4 @@
         }
 
-
         if ($value == $password) {
             // Authentication passed
@@ -42,7 +44,7 @@
             Session::put('is_policeman', $policeman);
             if($policeman){
-                Session::put('p_id', $exists[0]->p_id);
+                Session::put('pe_id', $is_policeman[0]->pe_id);
             } else {
-                Session::put('pe_id', $exists[0]->pe_id);
+                Session::put('pe_id', $is_officer[0]->pe_id);
             }
             return view('welcome');
@@ -56,4 +58,6 @@
     {
         Session::forget('badge_no');
+        Session::forget('p_id');
+        Session::forget('pe_id');
         Session::forget('is_policeman');
         return redirect('/login');