diff --git a/src/core/core.cpp b/src/core/core.cpp
index 56f760bc6..39af5cd59 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -893,7 +893,8 @@ QByteArray Core::loadToxSave(QString path)
                          tr("Your profile is already used by another qTox\n"
                             "Please select another profile"));
         path = Settings::getInstance().askProfiles();
-        qWarning() << "New profile is "<<QFileInfo(path).baseName();
+        Settings::getInstance().switchProfile(QFileInfo(path).baseName());
+        HistoryKeeper::resetInstance();
     }
 
     QFile configurationFile(path);
@@ -971,8 +972,19 @@ void Core::saveConfiguration()
     saveConfiguration(path);
 }
 
-void Core::switchConfiguration(const QString& profile)
+void Core::switchConfiguration(const QString& _profile)
 {
+    QString profile = QFileInfo(_profile).baseName();
+    // If we can't get a lock, then another instance is already using that profile
+    while (!profile.isEmpty() && !ProfileLocker::lock(profile))
+    {
+        qWarning() << "Profile "<<profile<<" is already in use, pick another";
+        GUI::showWarning(tr("Profile already in use"),
+                         tr("Your profile is already used by another qTox instance\n"
+                            "Please select another profile"));
+        profile = QFileInfo(Settings::getInstance().askProfiles()).baseName();
+    }
+
     if (profile.isEmpty())
         qDebug() << "Core: creating new Id";
     else
diff --git a/src/main.cpp b/src/main.cpp
index 9ce06878a..abf999c01 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
             return EXIT_FAILURE;
         }
     }
-    else if (!ipc.isCurrentOwner())
+    else if (!ipc.isCurrentOwner() && !parser.isSet("p"))
     {
         uint32_t dest = 0;
         if (parser.isSet("p"))