diff --git a/app/notification_push_test.go b/app/notification_push_test.go
index 727548fb9e..ae1e3ea279 100644
--- a/app/notification_push_test.go
+++ b/app/notification_push_test.go
@@ -1296,6 +1296,7 @@ func TestAllPushNotifications(t *testing.T) {
 	defer pushServer.Close()
 
 	th.App.UpdateConfig(func(cfg *model.Config) {
+		*cfg.EmailSettings.PushNotificationContents = model.GENERIC_NOTIFICATION
 		*cfg.EmailSettings.PushNotificationServer = pushServer.URL
 	})
 
diff --git a/model/config.go b/model/config.go
index 6a77ca336a..3e2a1422e2 100644
--- a/model/config.go
+++ b/model/config.go
@@ -369,7 +369,7 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
 	}
 
 	if s.EnableLinkPreviews == nil {
-		s.EnableLinkPreviews = NewBool(false)
+		s.EnableLinkPreviews = NewBool(true)
 	}
 
 	if s.EnableTesting == nil {
@@ -1459,7 +1459,7 @@ func (s *EmailSettings) SetDefaults(isUpdate bool) {
 	}
 
 	if s.PushNotificationContents == nil {
-		s.PushNotificationContents = NewString(GENERIC_NOTIFICATION)
+		s.PushNotificationContents = NewString(FULL_NOTIFICATION)
 	}
 
 	if s.EnableEmailBatching == nil {