diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs
index 163544ce3c..b1dc93ee49 100644
--- a/src/Core/Services/Implementations/OrganizationService.cs
+++ b/src/Core/Services/Implementations/OrganizationService.cs
@@ -565,6 +565,9 @@ namespace Bit.Core.Services
 
                 await _organizationUserRepository.CreateAsync(orgUser);
 
+                // push
+                await _pushService.PushSyncOrgKeysAsync(signup.Owner.Id);
+
                 return new Tuple<Organization, OrganizationUser>(organization, orgUser);
             }
             catch
diff --git a/src/Core/Services/Implementations/PushSharpPushService.cs b/src/Core/Services/Implementations/PushSharpPushService.cs
index 0571d314e1..652c98079a 100644
--- a/src/Core/Services/Implementations/PushSharpPushService.cs
+++ b/src/Core/Services/Implementations/PushSharpPushService.cs
@@ -64,7 +64,7 @@ namespace Bit.Core.Services
 
         public async Task PushSyncFolderCreateAsync(Folder folder)
         {
-            await PushFolderAsync(folder, PushType.SyncCipherCreate);
+            await PushFolderAsync(folder, PushType.SyncFolderCreate);
         }
 
         public async Task PushSyncFolderUpdateAsync(Folder folder)
@@ -148,7 +148,7 @@ namespace Bit.Core.Services
         {
             var message = new SyncUserPushNotification
             {
-                Type = PushType.SyncOrgKeys,
+                Type = type,
                 UserId = userId,
                 Date = DateTime.UtcNow,
                 Aps = new PushNotification.AppleData { ContentAvailable = 1 }