diff --git a/res/css/structures/_AutoHideScrollbar.scss b/res/css/structures/_AutoHideScrollbar.scss
index cb0d6f7f09..0e1faf727d 100644
--- a/res/css/structures/_AutoHideScrollbar.scss
+++ b/res/css/structures/_AutoHideScrollbar.scss
@@ -74,6 +74,7 @@ body.mx_scrollbar_nooverlay {
 // or fallback for webkit browsers
 ::-webkit-scrollbar {
     width: 6px;
+    height: 6px;
     background-color: $scrollbar-track-color;
 }
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 5b01912bb7..1453007b18 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1193,7 +1193,7 @@ export default React.createClass({
                 room_id: localStorage.getItem('mx_last_room_id'),
             });
         } else {
-            if (MatrixClientPeg.get().isGuest) {
+            if (MatrixClientPeg.get().isGuest()) {
                 dis.dispatch({action: 'view_welcome_page'});
             } else {
                 dis.dispatch({action: 'view_home_page'});