diff --git a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
index c8fba3e6d63..6e773ee8694 100644
--- a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
+++ b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
@@ -1,11 +1,15 @@
 package mage.client.util.sets;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
 import mage.cards.repository.ExpansionInfo;
 import mage.cards.repository.ExpansionRepository;
 import mage.constants.SetType;
 
-import java.util.*;
-
 /**
  * Utility class for constructed formats (expansions and other editions).
  *
@@ -13,6 +17,9 @@ import java.util.*;
  */
 public class ConstructedFormats {
 
+    private static GregorianCalendar calendar = new GregorianCalendar();
+    
+
     public static final String ALL = "- All Sets";
     public static final String STANDARD = "- Standard";
     public static final String EXTENDED = "- Extended";
@@ -489,9 +496,18 @@ public class ConstructedFormats {
     }
 
     private static void buildLists() {
+        GregorianCalendar cutoff;
+        // month is zero based so January = 0
+        if (calendar.get(Calendar.MONTH) > 8) {
+            cutoff = new GregorianCalendar(calendar.get(Calendar.YEAR) - 1, Calendar.SEPTEMBER, 1);
+        }
+        else {
+            cutoff = new GregorianCalendar(calendar.get(Calendar.YEAR) - 2, Calendar.SEPTEMBER, 1);
+        }
+        
         for (ExpansionInfo set : ExpansionRepository.instance.getAll()) {
             if (!set.getType().equals(SetType.REPRINT) && !set.getType().equals(SetType.JOKESET)) {
-                if (set.getReleaseDate().after(standardDate)) {
+                if (set.getReleaseDate().after(cutoff.getTime())) {
                     standard.add(set.getCode());
                 }
                 if (set.getReleaseDate().after(extendedDate)) {
@@ -505,8 +521,7 @@ public class ConstructedFormats {
     }
 
     private static final List<String> standard = new ArrayList<>();
-    private static final Date standardDate = new GregorianCalendar(2012, 9, 28).getTime();
-
+    
     private static final List<String> extended = new ArrayList<>();
     private static final Date extendedDate = new GregorianCalendar(2009, 8, 20).getTime();
 
diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java
index 85216e91586..2f89e0b4f69 100644
--- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java
@@ -46,7 +46,8 @@ public class Standard extends Constructed {
         super("Constructed - Standard");
         GregorianCalendar current = new GregorianCalendar();
         GregorianCalendar cutoff;
-        if (current.get(Calendar.MONTH) > 9) {
+        // month is zero based so January = 0
+        if (current.get(Calendar.MONTH) > 8) {
             cutoff = new GregorianCalendar(current.get(Calendar.YEAR) - 1, Calendar.SEPTEMBER, 1);
         }
         else {