From 84cbdc1358434ea0b979b082ea85b0dbe33985e7 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Sat, 25 Apr 2015 22:34:54 -0400
Subject: [PATCH] changed the password confirmation form field in the web
 installer so that it doesn't clobber some env vars, and allowed admin
 username and email to be set via env var

---
 src/install.js              | 4 ++--
 src/views/install/index.tpl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/install.js b/src/install.js
index 250aa4c799..e7bb669402 100644
--- a/src/install.js
+++ b/src/install.js
@@ -370,8 +370,8 @@ function createAdmin(callback) {
 		}
 
 		var results = {
-			username: install.values['admin:username'] || 'admin',
-			email: install.values['admin:email'] || '',
+			username: install.values['admin:username'] || nconf.get('admin:username') || 'admin',
+			email: install.values['admin:email'] || nconf.get('admin:email') || '',
 			password: install.values['admin:password'] || nconf.get('admin:password') || password,
 			'password:confirm': install.values['admin:password:confirm'] || nconf.get('admin:password') || password
 		};
diff --git a/src/views/install/index.tpl b/src/views/install/index.tpl
index 296c1d4d44..75d6c1e16a 100644
--- a/src/views/install/index.tpl
+++ b/src/views/install/index.tpl
@@ -78,8 +78,8 @@
 				</div>
 				<div class="row input-row">
 					<div class="col-sm-7 col-xs-12 input-field">
-						<label for="admin:password:confirm">Confirm Password</label>
-						<input type="password" class="form-control" name="admin:password:confirm" value="<!-- IF admin:password:confirm -->{admin:password:confirm}<!-- ENDIF admin:password:confirm -->" placeholder="Confirm Password" />
+						<label for="admin:passwordConfirm">Confirm Password</label>
+						<input type="password" class="form-control" name="admin:passwordConfirm" value="<!-- IF admin:passwordConfirm -->{admin:passwordConfirm}<!-- ENDIF admin:passwordConfirm -->" placeholder="Confirm Password" />
 					</div>
 					<div class="col-sm-5 help-text" data-help="Please confirm your password."></div>
 				</div>