From 97cc30e50296e6f740c06faad28fc0de0cc99e53 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 14 Apr 2017 20:10:09 -0400
Subject: [PATCH] Assorted fixes

---
 app/Console/Commands/UpdateEnvironment.php              | 6 ++++++
 resources/themes/pterodactyl/admin/users/new.blade.php  | 3 ---
 resources/themes/pterodactyl/admin/users/view.blade.php | 3 ---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Console/Commands/UpdateEnvironment.php b/app/Console/Commands/UpdateEnvironment.php
index d14901399..3dd26442f 100644
--- a/app/Console/Commands/UpdateEnvironment.php
+++ b/app/Console/Commands/UpdateEnvironment.php
@@ -85,6 +85,12 @@ class UpdateEnvironment extends Command
             $variables['SERVICE_AUTHOR'] = (string) Uuid::generate(4);
         }
 
+        if(isset($variables['APP_THEME'])) {
+            if ($variables['APP_THEME'] === 'default') {
+                $variables['APP_THEME'] = 'pterodactyl';
+            }
+        }
+
         if (is_null($this->option('dbhost'))) {
             $variables['DB_HOST'] = $this->anticipate('Database Host', ['localhost', '127.0.0.1', config('database.connections.mysql.host')], config('database.connections.mysql.host'));
         } else {
diff --git a/resources/themes/pterodactyl/admin/users/new.blade.php b/resources/themes/pterodactyl/admin/users/new.blade.php
index ada012874..a5ec18502 100644
--- a/resources/themes/pterodactyl/admin/users/new.blade.php
+++ b/resources/themes/pterodactyl/admin/users/new.blade.php
@@ -107,9 +107,6 @@
                             <input type="password" name="password" class="form-control" />
                         </div>
                     </div>
-                    <div class="form-group">
-                        <button class="btn btn-default btn-sm" id="gen_pass_bttn" type="button">Generate Password</button>
-                    </div>
                 </div>
             </div>
         </div>
diff --git a/resources/themes/pterodactyl/admin/users/view.blade.php b/resources/themes/pterodactyl/admin/users/view.blade.php
index 287b9cc84..fe89c45e8 100644
--- a/resources/themes/pterodactyl/admin/users/view.blade.php
+++ b/resources/themes/pterodactyl/admin/users/view.blade.php
@@ -85,9 +85,6 @@
                             <input type="password" id="password" name="password" class="form-control">
                         </div>
                     </div>
-                    <div class="form-group">
-                        <button class="btn btn-default btn-sm" id="gen_pass_bttn" type="button">Generate Password</button>
-                    </div>
                 </div>
             </div>
         </div>