diff --git a/api/controllers/generateBadges.py b/api/controllers/generateBadges.py
index f5b02ca4d..b73f32105 100644
--- a/api/controllers/generateBadges.py
+++ b/api/controllers/generateBadges.py
@@ -65,6 +65,7 @@ def generateBadges():
     font_type_3 = data.get('font_type_3') or 'helvetica'
     font_type_4 = data.get('font_type_4') or 'helvetica'
     font_type_5 = data.get('font_type_5') or 'helvetica'
+
     svg2png = SVG2PNG()
 
     if config.ENV == 'PROD':
@@ -148,9 +149,9 @@ def generateBadges():
 
     user_creator.allowed_usage = user_creator.allowed_usage - 1
 
-    badge_created = Badges(image=image_name, csv=csv_name,
-                           text_color=font_color_1, badge_size=badge_size,
-                           badge_name=badge_name, creator=user_creator)
+    badge_created = Badges(image=image_name, csv=csv_name, font_color_1=font_color_1, font_color_2=font_color_2,
+                           font_color_3=font_color_3, font_color_4=font_color_4, font_color_5=font_color_5,
+                           badge_size=badge_size, badge_name=badge_name, creator=user_creator)
 
     badge_created.save_to_db()
 
@@ -190,7 +191,7 @@ def send_badge_mail(badgeId, userId, badgeLink):
 @loginRequired
 def get_badges():
     input_data = request.args
-    page = request.args.get('page', 1, type=int)
+    page = request.args.get('filter[page]', 1, type=int)
     user = User.getUser(user_id=input_data.get('uid'))
     badges = db.session.query(Badges).filter_by(creator=user).paginate(
         page, app.config['POSTS_PER_PAGE'], False)
diff --git a/frontend/app/components/user-component/my-badges.js b/frontend/app/components/user-component/my-badges.js
index 1b63ddb16..42702a8c3 100644
--- a/frontend/app/components/user-component/my-badges.js
+++ b/frontend/app/components/user-component/my-badges.js
@@ -9,6 +9,7 @@ export default Component.extend({
   },
   queryParams   : ['page'],
   page          : 1,
+  routing       : inject.service('-routing'),
   notifications : inject.service('notification-messages'),
   actions       : {
     deleteBadge(badge) {
@@ -32,15 +33,16 @@ export default Component.extend({
     sendBadgeName(badge) {
       this.get('sendBadgeName')(badge);
     },
-
     nextPage() {
-      let filter = {};
-      if (this.page > 1) {
+      if (this.page >= 1) {
+        const uid = this.get('session.uid');
+        var filter = {};
         filter.page = this.page + 1;
-        this.get('store').query('my-badges', filter)
+        filter.state = 'all';
+        this.get('nextPage')(this.page).query('my-badges', { uid, filter })
           .then(records => {
             if (records.length > 0) {
-              this.set('my-badges', records);
+              this.set('model', records);
               this.set('page', this.page + 1);
             } else {
               this.get('notifications').clearAll();
@@ -66,12 +68,14 @@ export default Component.extend({
       }
     },
     prevPage() {
-      let filter = {};
       if (this.page - 1 > 0) {
+        const uid = this.get('session.uid');
+        var filter = {};
         filter.page = this.page - 1;
-        this.get('store').query('my-badges', filter)
+        filter.state = 'all';
+        this.get('nextPage')(this.page).query('my-badges', { uid, filter })
           .then(records => {
-            this.set('my-badges', records);
+            this.set('model', records);
             this.set('page', this.page - 1);
           })
           .catch(err => {
@@ -118,4 +122,3 @@ export default Component.extend({
     }
   }
 });
-
diff --git a/frontend/app/controllers/my-badges.js b/frontend/app/controllers/my-badges.js
index 0af2b9197..cb32231a8 100644
--- a/frontend/app/controllers/my-badges.js
+++ b/frontend/app/controllers/my-badges.js
@@ -21,7 +21,9 @@ export default Controller.extend({
           });
         });
     },
-
+    nextPage() {
+      return this.get('store');
+    },
     updateBadgeName(badge) {
       badge.save()
         .then(() => this.get('notifications').success('Badge Name Successfully Updated!', {
@@ -30,4 +32,4 @@ export default Controller.extend({
         }));
     }
   }
-});
+});
\ No newline at end of file
diff --git a/frontend/app/templates/my-badges.hbs b/frontend/app/templates/my-badges.hbs
index dc8893bee..527f8f530 100644
--- a/frontend/app/templates/my-badges.hbs
+++ b/frontend/app/templates/my-badges.hbs
@@ -1,3 +1,3 @@
 <div class="my-badge-width">
-    {{user-component/my-badges model=model user=user session=session sendbadgeId=(action 'deleteBadge') sendBadgeName=(action 'updateBadgeName')}}
-</div>
+    {{user-component/my-badges model=model user=user session=session sendbadgeId=(action 'deleteBadge') sendBadgeName=(action 'updateBadgeName') nextPage=(action 'nextPage')}}
+</div>
\ No newline at end of file