diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index 1cb8253812..1a448fa84e 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -146,7 +146,7 @@ module.exports = React.createClass({
     },
 
     _isUniEmail: function(email) {
-        return email.endsWith('.ac.uk') || email.endsWith('.edu');
+        return email.endsWith('.ac.uk') || email.endsWith('.edu') || email.endsWith('matrix.org');
     },
 
     validateField: function(field_id) {