diff --git a/runtime/pgAdmin4.cpp b/runtime/pgAdmin4.cpp
index 9ce1958b0..d7dd89e83 100644
--- a/runtime/pgAdmin4.cpp
+++ b/runtime/pgAdmin4.cpp
@@ -47,9 +47,9 @@ int main(int argc, char * argv[])
     QApplication app(argc, argv);
 
     // Setup the settings management
-    QCoreApplication::setOrganizationName("pgAdmin Development Team");
+    QCoreApplication::setOrganizationName("pgadmin");
     QCoreApplication::setOrganizationDomain("pgadmin.org");
-    QCoreApplication::setApplicationName(PGA_APP_NAME);
+    QCoreApplication::setApplicationName(PGA_APP_NAME.toLower().replace(" ", ""));
 
     // Display the spash screen
     QSplashScreen *splash = new QSplashScreen();