diff --git a/src/accountcreationwizard.cpp b/src/accountcreationwizard.cpp
index dc5504da3dd13b83af841cc0565c66e7bf43274d..847a793a899f26670d39f230acb6baf72914a434 100644
--- a/src/accountcreationwizard.cpp
+++ b/src/accountcreationwizard.cpp
@@ -57,8 +57,6 @@ struct _AccountCreationWizardPrivate
     gchar* avatar;
 
     GtkWidget *stack_account_creation;
-    QMetaObject::Connection account_state_changed;
-    QMetaObject::Connection name_registration_ended;
     gboolean username_available;
 
     /* choose_account_type_vbox */
@@ -127,7 +125,6 @@ account_creation_wizard_dispose(GObject *object)
     // make sure preview is stopped and destroyed
     account_creation_wizard_show_preview(ACCOUNT_CREATION_WIZARD(object), FALSE);
 
-    QObject::disconnect(priv->account_state_changed);
     G_OBJECT_CLASS(account_creation_wizard_parent_class)->dispose(object);
 }
 
@@ -311,22 +308,19 @@ create_existing_ring_account(AccountCreationWizard *win)
     gchar *password = g_strdup(gtk_entry_get_text(GTK_ENTRY(priv->entry_existing_account_password)));
     gtk_entry_set_text(GTK_ENTRY(priv->entry_existing_account_password), "");
 
-    gchar *pin = nullptr;
-    auto curPin = gtk_entry_get_text(GTK_ENTRY(priv->entry_existing_account_pin));
-    if (curPin and strlen(curPin) > 0) {
-        pin = g_strdup(curPin);
+    gchar *pin = g_strdup(gtk_entry_get_text(GTK_ENTRY(priv->entry_existing_account_pin)));
+    if (pin and strlen(pin) > 0) {
         gtk_entry_set_text(GTK_ENTRY(priv->entry_existing_account_pin), "");
     }
 
-    gchar *archive = nullptr;
-    auto archivePath = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(priv->entry_existing_account_archive));
-    if (archivePath) {
-        archive = g_strdup(archivePath);
+    gchar *archive = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(priv->entry_existing_account_archive)));
+    if (archive) {
         gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(priv->entry_existing_account_archive), nullptr);
     }
 
     auto status = create_ring_account(win, NULL, NULL, password, pin, archive);
 
+    g_free(archive);
     g_free(password);
     g_free(pin);
 
@@ -440,7 +434,7 @@ entries_existing_account_changed(G_GNUC_UNUSED GtkEntry *entry, AccountCreationW
     AccountCreationWizardPrivate *priv = ACCOUNT_CREATION_WIZARD_GET_PRIVATE(view);
 
     const gchar *pin = gtk_entry_get_text(GTK_ENTRY(priv->entry_existing_account_pin));
-    const gchar *archive_path = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(priv->entry_existing_account_archive));
+    gchar *archive_path = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(priv->entry_existing_account_archive));
 
     bool hasPin = pin and strlen(pin) > 0;
     bool hasArchive = archive_path and strlen(archive_path) > 0;
@@ -457,6 +451,8 @@ entries_existing_account_changed(G_GNUC_UNUSED GtkEntry *entry, AccountCreationW
         priv->button_existing_account_next,
         (hasArchive || hasPin)
     );
+
+    g_free(archive_path);
 }
 
 static void
diff --git a/src/avatarmanipulation.cpp b/src/avatarmanipulation.cpp
index 651dbaea97602961d1117abc68e83b9dd0ad5e39..93d0dfffc171b96b21fb8d918311d05955c12743 100644
--- a/src/avatarmanipulation.cpp
+++ b/src/avatarmanipulation.cpp
@@ -237,9 +237,9 @@ set_state(AvatarManipulation *self, AvatarManipulationState state)
                 auto photostr = priv->temporaryAvatar? priv->temporaryAvatar : (*priv->accountInfo_)->profileInfo.avatar;
                 QByteArray byteArray(photostr.c_str(), photostr.length());
                 QVariant avatar = Interfaces::PixbufManipulator().personPhoto(byteArray);
-                auto pixbuf_photo = Interfaces::PixbufManipulator().scaleAndFrame(avatar.value<std::shared_ptr<GdkPixbuf>>().get(), QSize(AVATAR_WIDTH, AVATAR_HEIGHT));
                 if (avatar.isValid()) {
-                    photo = pixbuf_photo;
+                    auto size = QSize(AVATAR_WIDTH, AVATAR_HEIGHT);
+                    photo = Interfaces::PixbufManipulator().scaleAndFrame(avatar.value<std::shared_ptr<GdkPixbuf>>().get(), size);
                 }
             }
             gtk_image_set_from_pixbuf(GTK_IMAGE(priv->image_avatar), photo.get());
diff --git a/src/conversationsview.cpp b/src/conversationsview.cpp
index 9efa4ce2ba42f0fb791b3cae680a55145e1bce39..0d708976e388ba76d81ae172ae408e9a29833f61 100644
--- a/src/conversationsview.cpp
+++ b/src/conversationsview.cpp
@@ -715,8 +715,11 @@ conversations_view_new(AccountInfoPointer const & accountInfo)
 
     priv->accountInfo_ = &accountInfo;
 
-    if (*priv->accountInfo_)
+    if (*priv->accountInfo_) {
         build_conversations_view(self);
+    } else {
+        g_debug("building conversationsview for inexistant account (just removed ?)");
+    }
 
     return (GtkWidget *)self;
 }
diff --git a/ui/accountcreationwizard.ui b/ui/accountcreationwizard.ui
index c21f0bef0c04ff15a1122124b5add4b566220bbd..11e558083fb86d522da0a8b6ce99840a5818874b 100644
--- a/ui/accountcreationwizard.ui
+++ b/ui/accountcreationwizard.ui
@@ -168,8 +168,6 @@
                                 <property name="width-chars">40</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="can_default">True</property>
-                                <property name="has_default">True</property>
                                 <property name="xalign">0.5</property>
                                 <property name="primary_icon_stock">gtk-dialog-authentication</property>
                                 <property name="input_purpose">password</property>
@@ -215,8 +213,6 @@
                         <property name="width-chars">40</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="has_default">True</property>
                         <property name="xalign">0.5</property>
                         <property name="primary_icon_stock">gtk-dialog-authentication</property>
                         <property name="input_purpose">password</property>
diff --git a/ui/newaccountsettingsview.ui b/ui/newaccountsettingsview.ui
index 7fde1f47594d0f3bef32c4025cfe7609a9ef9ca8..489e8608cfcb7775cceaa0e406d7687cb683ddf7 100644
--- a/ui/newaccountsettingsview.ui
+++ b/ui/newaccountsettingsview.ui
@@ -773,8 +773,6 @@
                                           <object class="GtkEntry" id="entry_sip_password">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="can_default">True</property>
-                                            <property name="has_default">True</property>
                                             <property name="halign">fill</property>
                                             <property name="visibility">False</property>
                                             <property name="primary_icon_stock">gtk-dialog-authentication</property>