Fixes for creating teams (#4387)

2 files changed, 3 insertions, 1 deletions

diff --git a/webapp/components/channel_notifications_modal.jsx b/webapp/components/channel_notifications_modal.jsx
index 91563a096..59ec40d84 100644
--- a/webapp/components/channel_notifications_modal.jsx
+++ b/webapp/components/channel_notifications_modal.jsx
@@ -80,7 +80,7 @@ export default class ChannelNotificationsModal extends React.Component {
     }
     createNotifyLevelSection(serverError) {
         // Get glabal user setting for notifications
-        const globalNotifyLevel = this.props.currentUser.notify_props.desktop;
+        const globalNotifyLevel = this.props.currentUser.notify_props ? this.props.currentUser.notify_props.desktop : 'all';
         let globalNotifyLevelName;
         if (globalNotifyLevel === 'all') {
             globalNotifyLevelName = (
diff --git a/webapp/components/create_team/components/team_url.jsx b/webapp/components/create_team/components/team_url.jsx
index 222755197..4bea240da 100644
--- a/webapp/components/create_team/components/team_url.jsx
+++ b/webapp/components/create_team/components/team_url.jsx
@@ -27,11 +27,13 @@ export default class TeamUrl extends React.Component {
             isLoading: false
         };
     }
+
     submitBack(e) {
         e.preventDefault();
         this.props.state.wizard = 'display_name';
         this.props.updateParent(this.props.state);
     }
+
     submitNext(e) {
         e.preventDefault();