diff --git a/includes/admin.php b/includes/admin.php
index 9bf19620..ea2ede1f 100755
--- a/includes/admin.php
+++ b/includes/admin.php
@@ -13,6 +13,10 @@ function DisplayAuthConfig($username, $password){
         } else if ($new_username == '') {
           $status->addMessage('Username must not be empty', 'danger');
         } else {
+          if (!file_exists(RASPI_ADMIN_DETAILS)) {
+              $tmpauth = fopen(RASPI_ADMIN_DETAILS, 'w');
+              fclose($tmpauth);
+	  }
           if ($auth_file = fopen(RASPI_ADMIN_DETAILS, 'w')) {
             fwrite($auth_file, $new_username.PHP_EOL);
             fwrite($auth_file, password_hash($_POST['newpass'], PASSWORD_BCRYPT).PHP_EOL);
diff --git a/index.php b/index.php
index 5ed8a06b..15994036 100755
--- a/index.php
+++ b/index.php
@@ -19,11 +19,13 @@
  */
 
 define('RASPI_CONFIG', '/etc/raspap');
-if(file_exists(RASPI_CONFIG.'/raspap.auth')) {
-    define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');
-} else {
-    define('RASPI_ADMIN_DETAILS','');
-}
+define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');
+
+//if(file_exists(RASPI_CONFIG.'/raspap.auth')) {
+//    define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');
+//} else {
+//    define('RASPI_ADMIN_DETAILS','');
+//}
 
 // Constants for configuration file paths.
 // These are typical for default RPi installs. Modify if needed.