diff --git a/.idea/misc.xml b/.idea/misc.xml
index ad53516..cc72de3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java b/app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java
index a58aeb7..ca7f653 100644
--- a/app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/CreateOrderActivity.java
@@ -34,6 +34,7 @@ public class CreateOrderActivity extends BaseActivity {
     private Boolean slicePizza;
     private String orderNote;
     private String discountAmount;
+    private String couponCode;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -207,4 +208,12 @@ public class CreateOrderActivity extends BaseActivity {
     public void setDiscountAmount(String discountAmount) {
         this.discountAmount = discountAmount;
     }
+
+    public String getCouponCode() {
+        return couponCode;
+    }
+
+    public void setCouponCode(String couponCode) {
+        this.couponCode = couponCode;
+    }
 }
diff --git a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java
index b83dabf..2a0f411 100644
--- a/app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/createOrder/PaymentMethodFragment.java
@@ -94,6 +94,7 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
                     createOrderActivity.onNextClicked(FRAGMENT_NAME);
                 }
                 else {
+                    createOrderActivity.setCouponCode(couponCodePizzalinkEditText.getText());
                     checkCoupon();
                 }
 
@@ -104,6 +105,10 @@ public class PaymentMethodFragment extends CreateOrderBaseFragment {
     }
 
     private void initViews(){
+        CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
+        if(createOrderActivity.getCouponCode() != null){
+            couponCodePizzalinkEditText.setText(createOrderActivity.getCouponCode());
+        }
         initRecyclerView();
     }