diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java
index 8e16f9ea7..b51263c0a 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java
@@ -128,7 +128,7 @@ public class DeckRequestHandler extends LotroServerRequestHandler implements Uri
             StringBuilder valid = new StringBuilder();
             StringBuilder invalid = new StringBuilder();
 
-            LotroFormat format = _formatLibrary.getHallFormats().get(targetFormat);
+            LotroFormat format = validateFormat(targetFormat);
             if(format == null || targetFormat == null)
             {
                 responseWriter.writeHtmlResponse("Invalid format: " + targetFormat);
@@ -207,11 +207,13 @@ public class DeckRequestHandler extends LotroServerRequestHandler implements Uri
 
             Player resourceOwner = getResourceOwnerSafely(request, participantId);
 
-            LotroDeck lotroDeck = _lotroServer.createDeckWithValidate(deckName, contents, targetFormat, notes);
+            LotroFormat validatedFormat = validateFormat(targetFormat);
+
+            LotroDeck lotroDeck = _lotroServer.createDeckWithValidate(deckName, contents, validatedFormat.getName(), notes);
             if (lotroDeck == null)
                 throw new HttpProcessingException(400);
 
-            _deckDao.saveDeckForPlayer(resourceOwner, deckName, targetFormat, notes, lotroDeck);
+            _deckDao.saveDeckForPlayer(resourceOwner, deckName, validatedFormat.getName(), notes, lotroDeck);
 
             DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
             DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
@@ -476,6 +478,23 @@ public class DeckRequestHandler extends LotroServerRequestHandler implements Uri
         return serializeDeck(deck);
     }
 
+    private LotroFormat validateFormat(String name)
+    {
+        LotroFormat validatedFormat = _formatLibrary.getFormat(name);
+        if(validatedFormat == null)
+        {
+            try {
+                validatedFormat = _formatLibrary.getFormatByName(name);
+            }
+            catch(Exception ex)
+            {
+                validatedFormat = _formatLibrary.getFormatByName("Anything Goes");
+            }
+        }
+
+        return validatedFormat;
+    }
+
     private Document serializeDeck(LotroDeck deck) throws ParserConfigurationException {
         DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
@@ -487,8 +506,11 @@ public class DeckRequestHandler extends LotroServerRequestHandler implements Uri
         if (deck == null)
             return doc;
 
+        LotroFormat validatedFormat = validateFormat(deck.getTargetFormat());
+
         Element targetFormat = doc.createElement("targetFormat");
-        targetFormat.setAttribute("formatName", deck.getTargetFormat());
+        targetFormat.setAttribute("formatName", validatedFormat.getName());
+        targetFormat.setAttribute("formatCode", validatedFormat.getCode());
         deckElem.appendChild(targetFormat);
 
         Element notes = doc.createElement("notes");
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
index b06a4822f..bc96f0829 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js
@@ -817,7 +817,7 @@ var GempLotrDeckBuildingUI = Class.extend({
         if (deckContents == null)
             alert("Deck must contain at least Ring-bearer, The One Ring and 9 sites");
         else
-            this.comm.saveDeck(this.deckName, $("#formatSelect :selected").text(), this.notes, deckContents, function (xml) {
+            this.comm.saveDeck(this.deckName, that.formatSelect.val(), this.notes, deckContents, function (xml) {
                 that.deckModified(false);
                 alert("Deck was saved");
             }, {
@@ -1021,13 +1021,10 @@ var GempLotrDeckBuildingUI = Class.extend({
             if (targetFormat.length > 0)
             {
                 var formatName = targetFormat[0].getAttribute("formatName");
+                var formatCode = targetFormat[0].getAttribute("formatCode");
                 //$('#formatSelect option[value="' + formatName + '"]').prop('selected', true);
  
-                $('#formatSelect option').each(function(){
-                  if($(this).text() == formatName){
-                     $(this).prop('selected', true);
-                  }
-                });
+                this.formatSelect.val(formatCode);
             }
             
             var notes = root.getElementsByTagName("notes");