diff --git a/static/js/controllers/roomchangecontroller.js b/static/js/controllers/roomchangecontroller.js
index d6d4259c..b641be49 100644
--- a/static/js/controllers/roomchangecontroller.js
+++ b/static/js/controllers/roomchangecontroller.js
@@ -59,6 +59,7 @@ define([], function() {
 				ctrl.getRoom(function(roomdata) {
 					console.info("Retrieved room data", roomdata);
 					$scope.roomdata = roomdata;
+					$element.find(".roomcreate-btn").get(0).focus();
 				});
 			}
 		};
diff --git a/static/js/directives/usability.js b/static/js/directives/usability.js
index 8ea6d259..470aa7e7 100644
--- a/static/js/directives/usability.js
+++ b/static/js/directives/usability.js
@@ -105,7 +105,11 @@ define(['jquery', 'underscore', 'text!partials/usability.html'], function($, _,
 						initializer = null;
 					}
 					// Check if we should show settings per default when in a room.
-					$scope.layout.settings = $scope.loadedUser ? false : true;
+					if(room && !$scope.loadedUser) {
+						$scope.layout.settings = true;
+					} else {
+						$scope.layout.settings = false;
+					}
 					ctrl.setInfo("ok");
 				}
 			});
diff --git a/static/partials/page/welcome.html b/static/partials/page/welcome.html
index 56ed4114..d96233b2 100644
--- a/static/partials/page/welcome.html
+++ b/static/partials/page/welcome.html
@@ -7,7 +7,7 @@
 		    <input type="text" class="form-control roomdata-link-input input-lg" ng-model="roomdata.name" placeholder="{{_('Creating room ...')}}">
 		    <div class="welcome-input-buttons">
 		      <a class="fa fa-refresh" ng-click="refreshRoom()"></a>
-		      <button class="btn btn-primary" type="button" ng-disabled="!roomdata.link" ng-click="changeRoomToId(roomdata.name)">{{_("Create")}}</button>
+		      <button class="btn btn-primary roomcreate-btn" type="button" ng-disabled="!roomdata.link" ng-click="changeRoomToId(roomdata.name)">{{_("Create")}}</button>
 		    </div>
 		  </div>
 		</p>
@@ -15,4 +15,4 @@
 		    <p ng-show="roomdata.name"><i class="fa fa-external-link"></i> <a href="{{roomdata.link}}" ng-click="changeRoomToId(roomdata.name);$event.preventDefault()">{{roomdata.link}}</a></p>
 		</center>
 	</div>
-</div>
\ No newline at end of file
+</div>