diff --git a/src/assets/translations/en.js b/src/assets/translations/en.js
index ff86c44..55bb54c 100644
--- a/src/assets/translations/en.js
+++ b/src/assets/translations/en.js
@@ -15,9 +15,12 @@ export default {
   },
   message: {
     you: "You",
+    user_created_room: "{user} created the room",
+    user_aliased_room: "{user} made the room alias {alias}",
     user_changed_display_name: "{user} changed display name to {displayName}",
     user_changed_avatar: "{user} changed the avatar",
     user_changed_room_avatar: "{user} changed the room avatar",
+    user_encrypted_room: "{user} made the room encrypted",
     user_was_invited: "{user} was invited to the chat...",
     user_joined: "{user} joined the chat",
     user_left: "{user} left the chat",
diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue
index c58370b..4093743 100644
--- a/src/components/CreateRoom.vue
+++ b/src/components/CreateRoom.vue
@@ -2,7 +2,7 @@
   <div class="create-room">
     <div>
       <v-container fluid>
-        <div class="room-name">{{$t('new_room.new_room')}}</div>
+        <div class="room-name">{{ $t("new_room.new_room") }}</div>
         <v-btn
           text
           class="header-button-left"
@@ -11,7 +11,7 @@
           :disabled="step > steps.NAME_SET"
         >
           <v-icon>arrow_back</v-icon>
-          <span>{{$t('menu.back')}}</span>
+          <span>{{ $t("menu.back") }}</span>
         </v-btn>
         <v-btn
           text
@@ -21,10 +21,58 @@
           class="header-button-right"
           @click.stop="next"
         >
-          <span>{{ step == steps.CREATED ? $t('new_room.done') : $t('new_room.next') }}</span>
+          <span>{{
+            step == steps.CREATED ? $t("new_room.done") : $t("new_room.next")
+          }}</span>
         </v-btn>
       </v-container>
     </div>
+    <v-container class="join-user-info">
+      <v-row v-if="canEditProfile">
+        <v-col class="flex-grow-0 flex-shrink-0">
+          <v-avatar @click="showAvatarPickerList">
+            <v-img v-if="selectedProfile" :src="selectedProfile.image" />
+          </v-avatar>
+        </v-col>
+        <v-col class="flex-shrink-1 flex-grow-1">
+          <v-select
+            ref="avatar"
+            :items="availableAvatars"
+            cache-items
+            :label="$t('join.user_name_label')"
+            outlined
+            dense
+            @change="selectAvatar"
+            :value="availableAvatars[0]"
+            single-line
+          >
+            <template v-slot:selection>
+              <v-text-field
+                background-color="transparent"
+                solo
+                flat
+                hide-details
+                @click.native.stop="
+                  {
+                  }
+                "
+                v-model="selectedProfile.name"
+              ></v-text-field>
+            </template>
+            <template v-slot:item="data">
+              <v-avatar size="32">
+                <v-img :src="data.item.image" />
+              </v-avatar>
+              <div class="ml-2">{{ data.item.name }}</div>
+            </template>
+          </v-select>
+          <v-switch
+            v-model="sharedComputer"
+            :label="$t('join.shared_computer')"
+          />
+        </v-col>
+      </v-row>
+    </v-container>
 
     <v-container fluid style="margin-top: 40px">
       <v-row>
@@ -49,9 +97,11 @@
 
     <v-fade-transition>
       <div class="section ma-3" flat v-if="step > steps.INITIAL">
-        <div class="h4 text-left">{{$t('new_room.join_permissions')}}</div>
-        <div class="h2 text-left">{{$t('new_room.set_join_permissions')}}</div>
-        <div>{{$t('new_room.join_permissions_info')}}</div>
+        <div class="h4 text-left">{{ $t("new_room.join_permissions") }}</div>
+        <div class="h2 text-left">
+          {{ $t("new_room.set_join_permissions") }}
+        </div>
+        <div>{{ $t("new_room.join_permissions_info") }}</div>
         <v-select
           :disabled="step >= steps.CREATING"
           :items="joinRules"
@@ -102,7 +152,8 @@
           depressed
           class="outlined-button"
           @click.stop="getPublicLink"
-          ><v-icon class="mr-2">link</v-icon>{{$t('new_room.get_link')}}</v-btn
+          ><v-icon class="mr-2">link</v-icon
+          >{{ $t("new_room.get_link") }}</v-btn
         >
         <v-btn
           v-else-if="joinRule == 'invite'"
@@ -110,10 +161,13 @@
           depressed
           class="outlined-button"
           @click.stop="addPeople"
-          ><v-icon class="mr-2">person_add</v-icon>{{$t('new_room.add_people')}}</v-btn
+          ><v-icon class="mr-2">person_add</v-icon
+          >{{ $t("new_room.add_people") }}</v-btn
         >
 
-        <div v-if="publicRoomLinkCopied" class="link-copied">{{$t('new_room.link_copied')}}</div>
+        <div v-if="publicRoomLinkCopied" class="link-copied">
+          {{ $t("new_room.link_copied") }}
+        </div>
 
         <div v-if="status">{{ status }}</div>
       </div>
@@ -155,24 +209,32 @@ export default {
       joinRules: [
         {
           id: "public",
-          text: this.$t('new_room.public_info'),
+          text: this.$t("new_room.public_info"),
           icon: "link",
-          descr: this.$t('new_room.public_description'),
+          descr: this.$t("new_room.public_description"),
         },
         {
           id: "invite",
-          text: this.$t('new_room.invite_info'),
+          text: this.$t("new_room.invite_info"),
           icon: "person_add",
-          descr: this.$t('new_room.invite_description'),
+          descr: this.$t("new_room.invite_description"),
         },
       ],
       publicRoomLink: null,
       publicRoomLinkCopied: false,
+      availableAvatars: [],
+      selectedProfile: null,
     };
   },
 
   mounted() {
     this.joinRule = this.joinRules[0].id; // Set default
+    this.availableAvatars = util.getDefaultAvatars();
+    this.selectAvatar(
+      this.availableAvatars[
+        Math.floor(Math.random() * this.availableAvatars.length)
+      ]
+    );
   },
 
   watch: {
@@ -187,6 +249,16 @@ export default {
       }
       return this.roomName.substring(0, 1).toUpperCase();
     },
+    currentUser() {
+      return this.$store.state.auth.user;
+    },
+    canEditProfile() {
+      // If we have an account already, we can't edit profile here (need to go into profile view)
+      if (this.currentUser) {
+        return false;
+      }
+      return true;
+    },
   },
 
   methods: {
@@ -261,8 +333,12 @@ export default {
     },
     createRoom() {
       this.step = steps.CREATING;
+
+      const hasUser = this.currentUser ? true : false;
+      var setProfileData = false;
+
       var roomId;
-      this.status = this.$t('new_room.status_creating');
+      this.status = this.$t("new_room.status_creating");
       var createRoomOptions = {};
       if (this.joinRule == "public") {
         createRoomOptions = {
@@ -308,26 +384,87 @@ export default {
         // Add topic
         createRoomOptions.topic = this.roomTopic;
       }
-      return this.$matrix.matrixClient
-        .createRoom(createRoomOptions)
-        .then(({ room_id, room_alias }) => {
-          roomId = room_alias || room_id;
-          if (!this.roomAvatarFile) {
-            return true;
-          }
-          const self = this;
-          return util.setRoomAvatar(
-            this.$matrix.matrixClient,
-            room_id,
-            this.roomAvatarFile,
-            function (p) {
-              if (p.total) {
-                self.status = this.$t('new_room.status_avatar_total', {count: (p.loaded || 0), total: p.total});
-              } else {
-                self.status = this.$t('new_room.status_avatar', {count: (p.loaded || 0)});
+
+      return this.$matrix
+        .getLoginPromise()
+        .then(
+          function (user) {
+            if (user.is_guest && !hasUser) {
+              // Newly created account, joining first room.
+              // Set avatar and display name to either the randomly chosen ones, or the
+              // ones the users has changed to.
+              setProfileData = true;
+
+              // Set display name and avatar directly on the matrix object.
+              if (
+                this.selectedProfile.name &&
+                this.selectedProfile.name.length > 0
+              ) {
+                this.$matrix.userDisplayName = this.selectedProfile.name;
               }
             }
-          );
+
+            if (
+              !setProfileData ||
+              !this.selectedProfile.name ||
+              this.selectedProfile.name.length == 0
+            ) {
+              return Promise.resolve(user);
+            } else {
+              console.log(
+                "CreateRoom: Set display name to: " + this.selectedProfile.name
+              );
+              return this.$matrix.matrixClient.setDisplayName(
+                this.selectedProfile.name,
+                undefined
+              );
+            }
+          }.bind(this)
+        )
+        .then(
+          function () {
+            if (!setProfileData || !this.selectedProfile.image) {
+              console.log("CreateRoom: No avatar change");
+              return Promise.resolve("no avatar");
+            } else {
+              console.log("CreateRoom: Updating avatar");
+              return util.setAvatar(
+                this.$matrix,
+                this.selectedProfile.image,
+                function (progress) {
+                  console.log("Progress: " + JSON.stringify(progress));
+                }
+              );
+            }
+          }.bind(this)
+        )
+        .then(() => {
+          return this.$matrix.matrixClient
+            .createRoom(createRoomOptions)
+            .then(({ room_id, room_alias }) => {
+              roomId = room_alias || room_id;
+              if (!this.roomAvatarFile) {
+                return true;
+              }
+              const self = this;
+              return util.setRoomAvatar(
+                this.$matrix.matrixClient,
+                room_id,
+                this.roomAvatarFile,
+                function (p) {
+                  if (p.total) {
+                    self.status = this.$t("new_room.status_avatar_total", {
+                      count: p.loaded || 0,
+                      total: p.total,
+                    });
+                  } else {
+                    self.status = this.$t("new_room.status_avatar", {
+                      count: p.loaded || 0,
+                    });
+                  }
+                }
+              );
+            });
         })
         .then(() => {
           this.status = "";
@@ -384,6 +521,14 @@ export default {
         }
       );
     },
+
+    selectAvatar(value) {
+      this.selectedProfile = Object.assign({}, value); // Make a copy, so editing does not destroy data
+    },
+
+    showAvatarPickerList() {
+      this.$refs.avatar.$refs.input.click();
+    },
   },
 };
 </script>
diff --git a/src/components/Join.vue b/src/components/Join.vue
index 2e5b024..5c1696f 100644
--- a/src/components/Join.vue
+++ b/src/components/Join.vue
@@ -119,9 +119,7 @@
 </template>
 
 <script>
-import User from "../models/user";
 import util from "../plugins/utils";
-import config from "../assets/config";
 
 export default {
   name: "Join",
@@ -129,7 +127,6 @@ export default {
     return {
       roomName: null,
       roomAvatar: null,
-      guestUser: new User(config.defaultServer, "", "", true),
       loading: false,
       loadingMessage: null,
       waitingForInfo: true,
@@ -226,7 +223,7 @@ export default {
         const self = this;
           this.waitingForMembership = true;
         if (this.currentUser) {
-          this.getLoginPromise()
+          this.$matrix.getLoginPromise()
           .then(() => {
             self.$matrix.setCurrentRoomId(self.roomAliasOrId); // Go to this room, now or when joined.
             const room = self.$matrix.getRoom(self.roomAliasOrId);
@@ -263,19 +260,6 @@ export default {
   },
 
   methods: {
-    /**
-     * Returns a promise that will log us into the Matrix.
-     * 
-     * Will use a real account, if we have one, otherwise will create
-     * a random account.
-     */
-    getLoginPromise() {
-      if (this.$matrix.ready) {
-        return Promise.resolve(this.$matrix.currentUser);
-      }
-      return this.$store.dispatch("login", this.currentUser || this.guestUser);
-    },
-
     getRoomInfo() {
       if (this.roomId.startsWith("#")) {
         this.$matrix
@@ -328,7 +312,7 @@ export default {
       this.loadingMessage = this.$t('join.status_logging_in');
       const hasUser = this.currentUser ? true : false;
       var setProfileData = false;
-      return this.getLoginPromise()
+      return this.$matrix.getLoginPromise()
         .then(
           function (user) {
             if (user.is_guest && !hasUser) {
diff --git a/src/components/messages/RoomAliased.vue b/src/components/messages/RoomAliased.vue
new file mode 100644
index 0000000..5a908e6
--- /dev/null
+++ b/src/components/messages/RoomAliased.vue
@@ -0,0 +1,17 @@
+<template>
+  <div class="statusEvent">
+    {{ $t('message.user_aliased_room', {user: stateEventDisplayName(event), alias: event.getContent().alias}) }}
+  </div>
+</template>
+
+<script>
+import messageMixin from "./messageMixin";
+
+export default {
+  mixins: [messageMixin],
+};
+</script>
+
+<style lang="scss">
+@import "@/assets/css/chat.scss";
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 8a088b0..a69fbc1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -82,7 +82,7 @@ const router = new VueRouter({
 });
 
 router.beforeEach((to, from, next) => {
-  const publicPages = ['/login'];
+  const publicPages = ['/login','/createroom'];
   var authRequired = !publicPages.includes(to.path);
   const loggedIn = router.app.$store.state.auth.user;
 
diff --git a/src/services/matrix.service.js b/src/services/matrix.service.js
index c68025f..00d4013 100644
--- a/src/services/matrix.service.js
+++ b/src/services/matrix.service.js
@@ -269,6 +269,19 @@ export default {
                         })
                 },
 
+                /**
+                * Returns a promise that will log us into the Matrix.
+                * 
+                * Will use a real account, if we have one, otherwise will create
+                * a random account.
+                */
+                getLoginPromise() {
+                    if (this.ready) {
+                        return Promise.resolve(this.currentUser);
+                    }
+                    return this.$store.dispatch("login", this.currentUser || new User(config.defaultServer, "", "", true));
+                },
+
                 addMatrixClientListeners(client) {
                     if (client) {
                         client.on("event", this.onEvent);