diff --git a/application/controllers/Login.php b/application/controllers/Login.php
index 6c9cf10f4..44c4debdf 100644
--- a/application/controllers/Login.php
+++ b/application/controllers/Login.php
@@ -41,9 +41,13 @@ class Login extends CI_Controller
 			return FALSE;
 		}
 
-		// trigger any required upgrade before starting the application
 		$this->load->library('migration');
-		$this->migration->latest();
+		if (!$this->migration->is_latest())
+		{
+			set_time_limit(1200);
+			// trigger any required upgrade before starting the application
+			$this->migration->latest();
+		}
 
 		if(!$this->Employee->login($username, $password))
 		{
diff --git a/application/libraries/MY_Migration.php b/application/libraries/MY_Migration.php
new file mode 100644
index 000000000..175fe4c4a
--- /dev/null
+++ b/application/libraries/MY_Migration.php
@@ -0,0 +1,18 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class MY_Migration extends CI_Migration {
+
+	public function is_latest()
+	{
+		$migrations = $this->find_migrations();
+		$last_migration = basename(end($migrations));
+
+		$last_version = $this->_get_migration_number($last_migration);
+		$current_version = $this->_get_version();
+
+		return $last_version == $current_version;
+	}
+
+}
\ No newline at end of file