diff --git a/src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs b/src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs
index 03161e510..095ed6b41 100644
--- a/src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs
+++ b/src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs
@@ -73,14 +73,26 @@ namespace NzbDrone.Api.ClientSchema
 
                     if (propertyInfo.PropertyType == typeof(Int32))
                     {
-                        var intValue = Convert.ToInt32(field.Value);
-                        propertyInfo.SetValue(target, intValue, null);
+                        var value = Convert.ToInt32(field.Value);
+                        propertyInfo.SetValue(target, value, null);
+                    }
+
+                    if (propertyInfo.PropertyType == typeof(Int64))
+                    {
+                        var value = Convert.ToInt64(field.Value);
+                        propertyInfo.SetValue(target, value, null);
                     }
 
                     else if (propertyInfo.PropertyType == typeof(Nullable<Int32>))
                     {
-                        var intValue = field.Value.ToString().ParseInt32();
-                        propertyInfo.SetValue(target, intValue, null);
+                        var value = field.Value.ToString().ParseInt32();
+                        propertyInfo.SetValue(target, value, null);
+                    }
+
+                    else if (propertyInfo.PropertyType == typeof(Nullable<Int64>))
+                    {
+                        var value = field.Value.ToString().ParseInt64();
+                        propertyInfo.SetValue(target, value, null);
                     }
 
                     else
diff --git a/src/NzbDrone.Common/TryParseExtension.cs b/src/NzbDrone.Common/TryParseExtension.cs
index 008bf5b7c..aea829ce2 100644
--- a/src/NzbDrone.Common/TryParseExtension.cs
+++ b/src/NzbDrone.Common/TryParseExtension.cs
@@ -15,5 +15,17 @@ namespace NzbDrone.Common
 
             return null;
         }
+
+        public static Nullable<long> ParseInt64(this string source)
+        {
+            Int64 result = 0;
+
+            if (Int64.TryParse(source, out result))
+            {
+                return result;
+            }
+
+            return null;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Core/Notifications/PushBullet/TestPushBulletCommand.cs b/src/NzbDrone.Core/Notifications/PushBullet/TestPushBulletCommand.cs
index 715be4661..e4fe19e83 100644
--- a/src/NzbDrone.Core/Notifications/PushBullet/TestPushBulletCommand.cs
+++ b/src/NzbDrone.Core/Notifications/PushBullet/TestPushBulletCommand.cs
@@ -13,6 +13,6 @@ namespace NzbDrone.Core.Notifications.PushBullet
             }
         }
         public string ApiKey { get; set; }
-        public int DeviceId { get; set; }
+        public long DeviceId { get; set; }
     }
 }