1 files changed, 12 insertions, 9 deletions
diff --git a/appservice/server.go b/appservice/server.go
index 48e26a6..5a5cebe 100644
--- a/appservice/server.go
+++ b/appservice/server.go
@@ -41,15 +41,18 @@ func Start(r *mxlib.Registration, c *Config) (chan error, error) {
 	if mxe, ok := err.(*mxlib.MxError); !ok || mxe.ErrCode != "M_USER_IN_USE" {
 		return nil, err
 	}
-	err = mx.ProfileDisplayname(ezbrMxId(), fmt.Sprintf("Easybridge (%s)", EASYBRIDGE_SYSTEM_PROTOCOL))
-	if err != nil {
-		return nil, err
-	}
-	err = mx.ProfileAvatar(ezbrMxId(), &connector.FileMediaObject{
-		Path: "easybridge.jpg",
-	})
-	if err != nil {
-		return nil, err
+	if err == nil {
+		// If Easybridge account was created, update avatar and display name
+		err = mx.ProfileAvatar(ezbrMxId(), &connector.FileMediaObject{
+			Path: "easybridge.jpg",
+		})
+		if err != nil {
+			return nil, err
+		}
+		err = mx.ProfileDisplayname(ezbrMxId(), fmt.Sprintf("Easybridge (%s)", EASYBRIDGE_SYSTEM_PROTOCOL))
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	router := mux.NewRouter()