diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java
index 4bbeb325d7..d8db299a2e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java
@@ -116,7 +116,7 @@ public class ClientUserRepository implements ServerOAuth2AuthorizedClientReposit
         newUser.setIsEnabled(true);
 
         return userService.findByEmail(user.getEmail())
-                .switchIfEmpty(userService.save(newUser)); //In case the user doesnt exist, save the user.
+                .switchIfEmpty(userService.create(newUser)); //In case the user doesnt exist, create and save the user.
     }
 
     @Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java
index a03b74f84a..a4e5a2be53 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java
@@ -127,7 +127,7 @@ public abstract class BaseService<R extends BaseRepository, T extends BaseDomain
                     analyticsProperties.put("id", ((BaseDomain) savedObject).getId());
                     analyticsProperties.put("organizationId", user.getOrganizationId());
                     analytics.enqueue(
-                            TrackMessage.builder("MONGO_DB_CREATE_" + savedObject.getClass())
+                            TrackMessage.builder("MONGO_DB_CREATE_" + savedObject.getClass().getSimpleName().toUpperCase())
                                     .userId(user.getId())
                                     .properties(analyticsProperties)
                     );
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserService.java
index acf87afaee..acacd8eeae 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserService.java
@@ -9,6 +9,4 @@ public interface UserService extends CrudService<User, String> {
 
     Mono<User> findByEmail(String email);
 
-    Mono<User> save(User newUser);
-
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
index 0c1cb36124..ed0da8b4a9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
@@ -56,7 +56,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
     }
 
     @Override
-    public Mono<User> save(User user) {
+    public Mono<User> create(User user) {
 
         Mono<User> savedUserMono = repository.save(user);
         return savedUserMono
diff --git a/app/server/appsmith-server/src/main/resources/application-local.properties b/app/server/appsmith-server/src/main/resources/application-local.properties
index af183e436b..07ab454d26 100644
--- a/app/server/appsmith-server/src/main/resources/application-local.properties
+++ b/app/server/appsmith-server/src/main/resources/application-local.properties
@@ -16,4 +16,9 @@ jdbc.postgres.password=root
 spring.security.oauth2.client.registration.google.client-id=869021686091-9b84bbf7ea683t1aaefqnmefcnmk6fq6.apps.googleusercontent.com
 spring.security.oauth2.client.registration.google.client-secret=9dvITt4OayEY1HfeY8bHX74p
 # Accounts from specific domains are allowed to login
-oauth2.allowed-domains=appsmith.com
\ No newline at end of file
+oauth2.allowed-domains=appsmith.com
+# Segment & Rollbar Properties
+# These properties are intentionally set to random values so that events are not sent to either of them during local development
+segment.writeKey=random-value
+com.rollbar.access-token=random-value
+com.rollbar.environment=development
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/main/resources/application-staging.properties b/app/server/appsmith-server/src/main/resources/application-staging.properties
index b8d7c99727..0ae620606d 100644
--- a/app/server/appsmith-server/src/main/resources/application-staging.properties
+++ b/app/server/appsmith-server/src/main/resources/application-staging.properties
@@ -14,4 +14,8 @@ jdbc.postgres.password=09275163cd7e737baf4c210b5e8db8ed88ddb7a0ee9acc82416fd7534
 spring.security.oauth2.client.registration.google.client-id=869021686091-9b84bbf7ea683t1aaefqnmefcnmk6fq6.apps.googleusercontent.com
 spring.security.oauth2.client.registration.google.client-secret=9dvITt4OayEY1HfeY8bHX74p
 # Accounts from specific domains are allowed to login
-oauth2.allowed-domains=appsmith.com
\ No newline at end of file
+oauth2.allowed-domains=appsmith.com
+# Segment & Rollbar Properties
+segment.writeKey=FIRLqUgMYuTlyS6yqOE2hBGZs5umkWhr
+com.rollbar.access-token=b91c4d5b9cac444088f4db9216ed6f42
+com.rollbar.environment=development
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/main/resources/application.properties b/app/server/appsmith-server/src/main/resources/application.properties
index 36f9cf4c45..2a5868428f 100644
--- a/app/server/appsmith-server/src/main/resources/application.properties
+++ b/app/server/appsmith-server/src/main/resources/application.properties
@@ -11,7 +11,3 @@ spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
 spring.jpa.show-sql=true
 # Jackson Properties
 spring.jackson.default-property-inclusion=non_null
-# Segment Properties
-segment.writeKey=FIRLqUgMYuTlyS6yqOE2hBGZs5umkWhr
-com.rollbar.access-token=b91c4d5b9cac444088f4db9216ed6f42
-com.rollbar.environment=development
\ No newline at end of file