diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 17204ee4e8..2403610416 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -303,7 +303,9 @@ module.exports = React.createClass({
         } : {};
 
         return this._matrixClient.register(
-            this.state.formVals.username.toLowerCase(),
+            (this.state.formVals.username ?
+                this.state.formVals.username.toLowerCase() : 
+                this.state.formVals.username),
             this.state.formVals.password,
             undefined, // session id: included in the auth dict already
             auth,