diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
index ef754a7b9..f097cd19d 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
@@ -96,7 +96,7 @@
 				<span class="ui-icon ui-icon-suitcase"></span>
 			</button>
 			
-			<button id="convertErrataBut" title="Convert to PC Errata" class="menu-button">
+			<button id="convertErrataBut" title="Convert to PC Errata" class="menu-button" disabled>
 				<span class="ui-icon ui-icon-transferthick-e-w"></span>
 			</button>
 
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 55b067dfe..1c6681d76 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
@@ -61,6 +61,7 @@ var GempLotrDeckBuildingUI = Class.extend({
 	cardInfoDialog: null,
 	
 	formats: null,
+	formatsInitialized:false,
 
 	init:function () {
 		var that = this;
@@ -110,14 +111,14 @@ var GempLotrDeckBuildingUI = Class.extend({
 						that.setMapVisibility(false);
 					}
 					
-					//PC format or Anything Goes
-					if(formatCode.includes("pc") || formatCode == "rev_tow_sta") {
+					//PC format or Anything Goes (if chosen, not when being default when page loads)
+					if((formatCode.includes("pc") || formatCode == "rev_tow_sta") && that.formatsInitialized) {
 						$("#convertErrataBut").button("option", "disabled", false);
 					}
 					else {
 						$("#convertErrataBut").button("option", "disabled", true);
 					}
-					
+
 					that.cardFilter.updateFormat(formatCode, that.formats[formatCode].blockFilters);
 				});
 		
@@ -1032,6 +1033,12 @@ var GempLotrDeckBuildingUI = Class.extend({
 			this.deckValidationDirty = true;
 			this.deckContentsDirty = true;
 			$("#editingDeck").html("<font color='orange'>*" + name + " - modified</font>");
+
+            //Enable the errata button if user starts adding cards to empty 'Anything Goes' deck after the page was initialized
+			let formatCode = this.formatSelect.val();
+            if(formatCode == "rev_tow_sta") {
+                $("#convertErrataBut").button("option", "disabled", false);
+            }
 		}
 		else
 		{
@@ -1122,6 +1129,8 @@ var GempLotrDeckBuildingUI = Class.extend({
 					const sleep = ms => new Promise(r => setTimeout(r, ms));
 					that.showNormalFilter();
 
+					that.formatsInitialized = true;
+
 					that.getCollectionTypes();
 				}, 
 				{
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
index 6a6d99013..a10e2abd6 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
@@ -1118,8 +1118,9 @@ var GempLotrHallUI = Class.extend({
 				for (var i = 0; i < formats.length; i++) {
 					var format = formats[i].childNodes[0].nodeValue;
 					var type = formats[i].getAttribute("type");
-					
-					var item = "<option value='" + type + "'>" + format + "</option>"
+
+                    var selected = (format === "Fellowship Block") ? " selected" : "";
+                    var item = "<option value='" + type + "'" + selected + ">" + format + "</option>";
 					
 					this.supportedFormatsSelect.append(item);
 				}