diff --git a/lib/models/application.js b/lib/models/application.js
index 9af732f0..f537559e 100644
--- a/lib/models/application.js
+++ b/lib/models/application.js
@@ -50,7 +50,7 @@ var PushNotificationSettingSchema = {
  * Data model for Application
  */
 var ApplicationSchema = {
-  id: {type: String, id: true, generated: true},
+  id: {type: String, id: true},
   // Basic information
   name: {type: String, required: true}, // The name
   description: String, // The description
diff --git a/test/model.application.test.js b/test/model.application.test.js
index d7f24df1..5d8a92a5 100644
--- a/test/model.application.test.js
+++ b/test/model.application.test.js
@@ -20,6 +20,7 @@ describe('Application', function () {
       assert(app.masterKey);
       assert(app.created);
       assert(app.modified);
+      assert.equal(typeof app.id, 'string');
       done(err, result);
     });
   });