diff --git a/lib/agendash.js b/lib/agendash.js
index 9b49a444..2ddbc338 100644
--- a/lib/agendash.js
+++ b/lib/agendash.js
@@ -81,15 +81,23 @@ module.exports = function (agenda, options) {
       /*
       TODO: Need to validate user input.
       */
-      agenda.create(jobName,jobData)
-        .schedule(jobSchedule)
-        .repeatEvery(jobRepeatEvery)
-        .save(function (err) {
-          if (err) {
-            callback('Jobs not created')
-          }
-          callback()
-        });
+      var job = agenda.create(jobName,jobData)
+      if (jobSchedule && jobRepeatEvery) {
+        job.repeatAt(jobSchedule)
+        job.repeatEvery(jobRepeatEvery)
+      } else if (jobSchedule) {
+        job.schedule(jobSchedule)
+      } else if (jobRepeatEvery) {
+        job.repeatEvery(jobRepeatEvery)
+      } else {
+        return callback('Jobs not created')
+      }
+      job.save(function (err) {
+        if (err) {
+          return callback('Jobs not created')
+        }
+        callback()
+      });
     } catch (e) {
       callback(e.message)
     }