diff --git a/static/js/controllers/usersettingscontroller.js b/static/js/controllers/usersettingscontroller.js
index f716db16..d0104924 100644
--- a/static/js/controllers/usersettingscontroller.js
+++ b/static/js/controllers/usersettingscontroller.js
@@ -27,7 +27,7 @@ define([], function() {
 
 		$scope.withUsersForget = true;
 
-		this.registerUserid = function(btn) {
+		this.registerUserid = function(event) {
 
 			var successHandler = function(data) {
 				console.info("Created new userid:", data.userid);
@@ -40,8 +40,13 @@ define([], function() {
 				delete data.nonce;
 			};
 
+			var form = null;
+			if (event && event.target) {
+				form = event.target.form;
+			}
+
 			console.log("No userid - creating one ...");
-			mediaStream.users.register(btn.form, function(data) {
+			mediaStream.users.register(form, function(data) {
 				if (data.nonce) {
 					successHandler(data);
 				} else {
diff --git a/static/partials/settings.html b/static/partials/settings.html
index ba1a3493..37a56da9 100644
--- a/static/partials/settings.html
+++ b/static/partials/settings.html
@@ -13,7 +13,7 @@
                 <div ng-if="!userid">
                   <keygen class="hidden" name="pubkey"/>
                   <label ng-if="!userid && withUsersRegistration && usersettings.registerUserid">
-                    <button class="btn btn-small btn-primary" ng-click="usersettings.registerUserid($event.target)">{{_('Register')}}</button>
+                    <button class="btn btn-small btn-primary" ng-click="usersettings.registerUserid($event)">{{_('Register')}}</button>
                   </label>
                   <iframe class="hidden" name="users_registration_certificate_iframe"></iframe>
                 </div>
@@ -28,7 +28,7 @@
                     <button class="btn btn-small btn-primary btn-sign-in" ng-click="usersettings.loginUserid()">{{_('Sign in')}}</button>
                   </label>
                   <label ng-if="usersettings.registerUserid">
-                    <button class="btn btn-small btn-link btn-create-account" ng-click="usersettings.registerUserid($event.target)">{{_('Create an account')}}</button>
+                    <button class="btn btn-small btn-link btn-create-account" ng-click="usersettings.registerUserid($event)">{{_('Create an account')}}</button>
                   </label>
                 </div>
                 <p class="form-control-static well well-sm" ng-if="userid">{{userid|displayUserid}}</p>