diff --git a/public/src/installer/install.js b/public/src/installer/install.js
index 0ec469ff5b..63698ce7ad 100644
--- a/public/src/installer/install.js
+++ b/public/src/installer/install.js
@@ -55,6 +55,15 @@ $('document').ready(function() {
 			}
 		}
 
+		function validateEmail(field) {
+			if (!utils.isEmailValid(field)) {
+				parent.addClass('error');
+				help.html('Invalid Email Address.');
+			} else {
+				parent.removeClass('error');
+			}
+		}
+
 		switch (type) {
 			case 'username':
 				return validateUsername(field);
@@ -62,6 +71,8 @@ $('document').ready(function() {
 				return validatePassword(field);
 			case 'confirm':
 				return validateConfirmPassword(field);
+			case 'email':
+				return validateEmail(field);
 		}
 	}
 });
\ No newline at end of file
diff --git a/src/views/install/index.tpl b/src/views/install/index.tpl
index 5dbd31de84..222d08abf5 100644
--- a/src/views/install/index.tpl
+++ b/src/views/install/index.tpl
@@ -55,6 +55,13 @@
 				</div>
 				<div class="col-sm-5 help-text" data-help="Enter an <strong>alphanumeric username</strong>. Spaces between words are allowed. You can always change your username later on your profile page."></div>
 			</div>
+			<div class="row input-row">
+				<div class="col-sm-7 col-xs-12 input-field">
+					<label for="email">Email Address</label>
+					<input type="text" class="form-control" name="email" placeholder="Email Address" />	
+				</div>
+				<div class="col-sm-5 help-text" data-help="Please enter your email address."></div>
+			</div>
 			<div class="row input-row">
 				<div class="col-sm-7 col-xs-12 input-field">
 					<label for="password">Password</label>
@@ -67,7 +74,7 @@
 					<label for="confirm">Confirm Password</label>
 					<input type="password" class="form-control" name="confirm" placeholder="Confirm Password" />	
 				</div>
-				<div class="col-sm-5 help-text" data-help="Re-enter your password again."></div>
+				<div class="col-sm-5 help-text" data-help="Please confirm your password."></div>
 			</div>
 		</form>
 	</div>