diff --git a/src/librssguard/miscellaneous/databasequeries.cpp b/src/librssguard/miscellaneous/databasequeries.cpp
index 794d24cb0..61f3055dc 100755
--- a/src/librssguard/miscellaneous/databasequeries.cpp
+++ b/src/librssguard/miscellaneous/databasequeries.cpp
@@ -1798,7 +1798,7 @@ bool DatabaseQueries::createOwnCloudAccount(const QSqlDatabase& db, int id_to_as
   }
 }
 
-int DatabaseQueries::createAccount(const QSqlDatabase& db, const QString& code, bool* ok) {
+int DatabaseQueries::createBaseAccount(const QSqlDatabase& db, const QString& code, bool* ok) {
   QSqlQuery q(db);
 
   // First obtain the ID, which can be assigned to this new account.
@@ -1838,6 +1838,13 @@ int DatabaseQueries::createAccount(const QSqlDatabase& db, const QString& code,
   }
 }
 
+void DatabaseQueries::editBaseAccount(const QSqlDatabase& db, ServiceRoot* account, bool* ok) {
+  Q_UNUSED(account)
+  Q_UNUSED(ok)
+
+  // TODO: edit proxy etc
+}
+
 bool DatabaseQueries::deleteFeed(const QSqlDatabase& db, int feed_custom_id, int account_id) {
   QSqlQuery q(db);
 
diff --git a/src/librssguard/miscellaneous/databasequeries.h b/src/librssguard/miscellaneous/databasequeries.h
index ffaa4e15e..6012fb6f7 100644
--- a/src/librssguard/miscellaneous/databasequeries.h
+++ b/src/librssguard/miscellaneous/databasequeries.h
@@ -88,7 +88,8 @@ class DatabaseQueries {
                                                    bool* ok = nullptr);
 
     // Common account methods.
-    static int createAccount(const QSqlDatabase& db, const QString& code, bool* ok = nullptr);
+    static int createBaseAccount(const QSqlDatabase& db, const QString& code, bool* ok = nullptr);
+    static void editBaseAccount(const QSqlDatabase& db, ServiceRoot* account, bool* ok = nullptr);
     static int updateMessages(QSqlDatabase db, const QList<Message>& messages, const QString& feed_custom_id,
                               int account_id, const QString& url, bool force_update, bool* any_message_changed, bool* ok = nullptr);
     static bool deleteAccount(const QSqlDatabase& db, int account_id);
diff --git a/src/librssguard/services/gmail/gmailserviceroot.cpp b/src/librssguard/services/gmail/gmailserviceroot.cpp
index 50bba9e13..69e84a711 100644
--- a/src/librssguard/services/gmail/gmailserviceroot.cpp
+++ b/src/librssguard/services/gmail/gmailserviceroot.cpp
@@ -91,7 +91,7 @@ void GmailServiceRoot::saveAccountDataToDatabase() {
   }
   else {
     bool saved;
-    int id_to_assign = DatabaseQueries::createAccount(database, code(), &saved);
+    int id_to_assign = DatabaseQueries::createBaseAccount(database, code(), &saved);
 
     if (saved) {
       if (DatabaseQueries::createGmailAccount(database, id_to_assign,
diff --git a/src/librssguard/services/inoreader/inoreaderserviceroot.cpp b/src/librssguard/services/inoreader/inoreaderserviceroot.cpp
index c894b95f7..5e2baacdd 100644
--- a/src/librssguard/services/inoreader/inoreaderserviceroot.cpp
+++ b/src/librssguard/services/inoreader/inoreaderserviceroot.cpp
@@ -61,7 +61,7 @@ void InoreaderServiceRoot::saveAccountDataToDatabase() {
   }
   else {
     bool saved;
-    int id_to_assign = DatabaseQueries::createAccount(database, code(), &saved);
+    int id_to_assign = DatabaseQueries::createBaseAccount(database, code(), &saved);
 
     if (saved) {
       if (DatabaseQueries::createInoreaderAccount(database, id_to_assign,
diff --git a/src/librssguard/services/owncloud/owncloudserviceroot.cpp b/src/librssguard/services/owncloud/owncloudserviceroot.cpp
index 0a41514f6..2768b8605 100644
--- a/src/librssguard/services/owncloud/owncloudserviceroot.cpp
+++ b/src/librssguard/services/owncloud/owncloudserviceroot.cpp
@@ -142,7 +142,7 @@ void OwnCloudServiceRoot::saveAccountDataToDatabase() {
   }
   else {
     bool saved;
-    int id_to_assign = DatabaseQueries::createAccount(database, code(), &saved);
+    int id_to_assign = DatabaseQueries::createBaseAccount(database, code(), &saved);
 
     if (saved) {
       if (DatabaseQueries::createOwnCloudAccount(database, id_to_assign, m_network->authUsername(),
diff --git a/src/librssguard/services/standard/standardserviceentrypoint.cpp b/src/librssguard/services/standard/standardserviceentrypoint.cpp
index d5620c929..9cce4d49a 100644
--- a/src/librssguard/services/standard/standardserviceentrypoint.cpp
+++ b/src/librssguard/services/standard/standardserviceentrypoint.cpp
@@ -31,7 +31,7 @@ ServiceRoot* StandardServiceEntryPoint::createNewRoot() const {
   // Switch DB.
   QSqlDatabase database = qApp->database()->connection(QSL("StandardServiceEntryPoint"));
   bool ok;
-  int new_id = DatabaseQueries::createAccount(database, code(), &ok);
+  int new_id = DatabaseQueries::createBaseAccount(database, code(), &ok);
 
   if (ok) {
     auto* root = new StandardServiceRoot();
diff --git a/src/librssguard/services/tt-rss/ttrssserviceroot.cpp b/src/librssguard/services/tt-rss/ttrssserviceroot.cpp
index 4b5b073de..2ca8ae308 100644
--- a/src/librssguard/services/tt-rss/ttrssserviceroot.cpp
+++ b/src/librssguard/services/tt-rss/ttrssserviceroot.cpp
@@ -227,7 +227,7 @@ void TtRssServiceRoot::saveAccountDataToDatabase() {
   }
   else {
     bool saved;
-    int id_to_assign = DatabaseQueries::createAccount(database, code(), &saved);
+    int id_to_assign = DatabaseQueries::createBaseAccount(database, code(), &saved);
 
     if (saved) {
       if (DatabaseQueries::createTtRssAccount(database, id_to_assign, m_network->username(),