diff --git a/skins/base/views/templates/Register.js b/skins/base/views/templates/Register.js
index 13b9b2a1f1..94f3b96971 100644
--- a/skins/base/views/templates/Register.js
+++ b/skins/base/views/templates/Register.js
@@ -53,10 +53,10 @@ module.exports = React.createClass({
                 return (
                     <div>
                         <form onSubmit={this.onInitialStageSubmit}>
-                        Email: <input type="text" ref="email" /><br />
-                        Username: <input type="text" ref="username" /><br />
-                        Password: <input type="password" ref="password" /><br />
-                        Confirm Password: <input type="password" ref="confirmPassword" /><br />
+                        Email: <input type="text" ref="email" defaultValue={this.savedParams.email} /><br />
+                        Username: <input type="text" ref="username" defaultValue={this.savedParams.username} /><br />
+                        Password: <input type="password" ref="password" defaultValue={this.savedParams.password} /><br />
+                        Confirm Password: <input type="password" ref="confirmPassword" defaultValue={this.savedParams.confirmPassword} /><br />
                         <ServerConfig ref="serverConfig" />
                         <input type="submit" value="Continue" />
                         </form>
diff --git a/src/controllers/templates/Register.js b/src/controllers/templates/Register.js
index 2ff75e0c6c..664b36b307 100644
--- a/src/controllers/templates/Register.js
+++ b/src/controllers/templates/Register.js
@@ -42,6 +42,12 @@ module.exports = {
     },
 
     componentWillMount: function() {
+        this.savedParams = {
+            email: '',
+            username: '',
+            password: '',
+            confirmPassword: ''
+        };
         this.readNewProps();
     },
 
@@ -163,6 +169,7 @@ module.exports = {
         ev.preventDefault();
 
         var formVals = this.getRegFormVals();
+        this.savedParams = formVals;
 
         var badFields = {};
         if (formVals.password != formVals.confirmPassword) {