diff --git a/system/install/step3.php b/system/install/step3.php
index 0437f8b5..29db1b36 100644
--- a/system/install/step3.php
+++ b/system/install/step3.php
@@ -28,7 +28,7 @@
 				echo '<h4 style="color: red;"> Unable to Connect Database, Please make sure database info is correct and try again ! </h4>';
 			}//
 
-			$cururl = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+			$cururl = (((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')|| $_SERVER['SERVER_PORT'] == 443)?'https':'http').'://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 			$appurl = str_replace('/install/step3.php', '', $cururl);
 			$appurl = str_replace('?_error=1', '', $appurl);
 			$appurl = str_replace('/system', '', $appurl);
diff --git a/system/install/step5.php b/system/install/step5.php
index 4e71d92d..5c72f25a 100644
--- a/system/install/step5.php
+++ b/system/install/step5.php
@@ -29,14 +29,14 @@
 				To Login Admin Portal:<br>
 				Use this link -
 				<?php
-				$cururl = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+				$cururl = (((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')|| $_SERVER['SERVER_PORT'] == 443)?'https':'http').'://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 				$appurl = str_replace('/install/step5.php', '', $cururl);
 				$appurl = str_replace('/system', '', $appurl);
 				echo '<a href="' . $appurl . '/admin">' . $appurl . '/admin</a>';
 				?>
 				<br>
 				Username: admin<br>
-				Password: 123456<br>
+				Password: admin<br>
 				For security, Delete the <b>install</b> directory inside system folder.
 			</p>
 		</div>