diff --git a/lib/views/sign_up_password.dart b/lib/views/sign_up_password.dart
index da526f52..0a53ccb8 100644
--- a/lib/views/sign_up_password.dart
+++ b/lib/views/sign_up_password.dart
@@ -91,25 +91,27 @@ class _SignUpPasswordState extends State<SignUpPassword> {
       setState(() => passwordError = exception.toString());
       return setState(() => loading = false);
     }
+    await matrix.client.onLoginStateChanged.stream
+        .firstWhere((l) => l == LoginState.logged);
     try {
       await matrix.client.setDisplayname(widget.displayname);
     } catch (exception) {
       Toast.show(I18n.of(context).couldNotSetDisplayname, context, duration: 5);
     }
-    try {
-      await matrix.client.setAvatar(
-        MatrixFile(
-          bytes: await widget.avatar.readAsBytes(),
-          path: widget.avatar.path,
-        ),
-      );
-    } catch (exception) {
-      Toast.show(I18n.of(context).couldNotSetAvatar, context, duration: 5);
-    }
-    if (matrix.client.isLogged()) {
-      await Navigator.of(context).pushAndRemoveUntil(
-          AppRoute.defaultRoute(context, ChatListView()), (r) => false);
+    if (widget.avatar != null) {
+      try {
+        await matrix.client.setAvatar(
+          MatrixFile(
+            bytes: await widget.avatar.readAsBytes(),
+            path: widget.avatar.path,
+          ),
+        );
+      } catch (exception) {
+        Toast.show(I18n.of(context).couldNotSetAvatar, context, duration: 5);
+      }
     }
+    await Navigator.of(context).pushAndRemoveUntil(
+        AppRoute.defaultRoute(context, ChatListView()), (r) => false);
     setState(() => loading = false);
   }
 
diff --git a/pubspec.lock b/pubspec.lock
index 41b566c6..daaf5a14 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -110,8 +110,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "87f1a4ed99e067b184c99919656b1cde925f4a8f"
-      resolved-ref: "87f1a4ed99e067b184c99919656b1cde925f4a8f"
+      ref: "2e6a1ab4d4b4f9d635890610310f4b683853a549"
+      resolved-ref: "2e6a1ab4d4b4f9d635890610310f4b683853a549"
       url: "https://gitlab.com/famedly/famedlysdk.git"
     source: git
     version: "0.0.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index 1bd3511d..c24a9424 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,7 +27,7 @@ dependencies:
   famedlysdk:
     git:
       url: https://gitlab.com/famedly/famedlysdk.git
-      ref: 87f1a4ed99e067b184c99919656b1cde925f4a8f
+      ref: 2e6a1ab4d4b4f9d635890610310f4b683853a549
 
   localstorage: ^3.0.1+4
   bubble: ^1.1.9+1