diff --git a/js/index.js b/js/index.js
index 6a38497c9..e919800af 100644
--- a/js/index.js
+++ b/js/index.js
@@ -1,8 +1,17 @@
 var webrtc;
 $(window).load(function() {
+	$('#oca-spreedme-add-room').submit(function() {
+		return false;
+	});
+
 	// Create a new room
 	$('#oca-spreedme-add-room > button.icon-confirm').click(function() {
-		OCA.SpreedMe.Rooms.create($('#oca-spreedme-add-room > input[type="text"]').val());
+		var roomname = $('#oca-spreedme-add-room > input[type="text"]').val();
+		if (roomname === "") {
+			return;
+		}
+
+		OCA.SpreedMe.Rooms.create(roomname);
 	});
 
 	// Load the list of rooms all 10 seconds
diff --git a/js/rooms.js b/js/rooms.js
index 478d6273b..27ed10ab2 100644
--- a/js/rooms.js
+++ b/js/rooms.js
@@ -10,7 +10,8 @@
 				{
 					roomName: roomName
 				},
-				function(roomId) {
+				function(data) {
+					var roomId = data.roomId;
 					OCA.SpreedMe.Rooms.join(roomId);
 				}
 			);