diff --git a/app/src/main/java/tk/therealsuji/vtopchennai/fragments/AssignmentsFragment.java b/app/src/main/java/tk/therealsuji/vtopchennai/fragments/AssignmentsFragment.java
index 8010cdf..af2af37 100644
--- a/app/src/main/java/tk/therealsuji/vtopchennai/fragments/AssignmentsFragment.java
+++ b/app/src/main/java/tk/therealsuji/vtopchennai/fragments/AssignmentsFragment.java
@@ -108,7 +108,7 @@ public void onError(@NonNull Throwable e) {
      * Function to get a list of course ids
      */
     private void getCourses() {
-        this.moodleApi.getCourses(this.moodleToken)
+        this.moodleApi.getCourses(this.moodleToken, this.moodleUserId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SingleObserver<ResponseBody>() {
@@ -120,10 +120,14 @@ public void onSubscribe(@NonNull Disposable d) {
                     @Override
                     public void onSuccess(@NonNull ResponseBody responseBody) {
                         try {
-                            JSONObject response = new JSONObject(responseBody.string());
-                            throwErrorIfExists(response);
+                            String response = responseBody.string();
+
+                            if (response.startsWith("{")) {
+                                throwErrorIfExists(new JSONObject(response));
+                                throw new Exception("Unknown Error.");
+                            }
 
-                            JSONArray courses = response.getJSONArray("courses");
+                            JSONArray courses = new JSONArray(response);
                             List<Integer> courseIds = new ArrayList<>();
 
                             for (int i = 0; i < courses.length(); ++i) {
diff --git a/app/src/main/java/tk/therealsuji/vtopchennai/interfaces/MoodleApi.java b/app/src/main/java/tk/therealsuji/vtopchennai/interfaces/MoodleApi.java
index bc49c55..8f88404 100644
--- a/app/src/main/java/tk/therealsuji/vtopchennai/interfaces/MoodleApi.java
+++ b/app/src/main/java/tk/therealsuji/vtopchennai/interfaces/MoodleApi.java
@@ -23,10 +23,10 @@ Single<ResponseBody> signIn(@Query("username") String username,
     Single<ResponseBody> getUserId(@Query("wstoken") String moodleToken);
 
     @GET(SettingsRepository.MOODLE_WEBSERVICE_PATH +
-            "?wsfunction=core_course_get_enrolled_courses_by_timeline_classification" +
-            "&classification=inprogress" +
+            "?wsfunction=core_enrol_get_users_courses" +
             "&moodlewsrestformat=json")
-    Single<ResponseBody> getCourses(@Query("wstoken") String moodleToken);
+    Single<ResponseBody> getCourses(@Query("wstoken") String moodleToken,
+                                    @Query("userid") int userId);
 
     @GET(SettingsRepository.MOODLE_WEBSERVICE_PATH +
             "?wsfunction=mod_assign_get_assignments" +