diff --git a/index.html b/index.html
index 0fdb7e4..b4ec12c 100644
--- a/index.html
+++ b/index.html
@@ -6621,8 +6621,6 @@ janin.currencies = [
     janin.currency.createCurrency ("Testnet Bitcoin", 0x6f, 0xef, "9", "c", null)
                    ];
 
-janin.selectedCurrency = janin.currencies[1];
-
 	</script>
 	<script type="text/javascript">
 var ninja = { wallets: {} };
@@ -9264,6 +9262,7 @@ if (ninja.getQueryString()["showseedpool"] == "true" || ninja.getQueryString()["
 	document.getElementById("seedpoolarea").style.display = "block";
 }
 // change currency
+janin.selectedCurrency = janin.currencies[1];
 if (ninja.getQueryString()["currency"] != undefined) {
 	for(i = 0; i < janin.currencies.length; i++) {
 		if (janin.currencies[i].name == ninja.getQueryString()["currency"])
@@ -9275,7 +9274,7 @@ var select = document.getElementById("currency");
 var options = "";
 for(i = 0; i < janin.currencies.length; i++) {
     options += "<option value='"+i+"'";
-	if(janin.currencies[i].name=="Bitcoin")
+	if(janin.currencies[i].name == janin.currency.name())
 		options += " selected='selected'";
 	options += ">"+janin.currencies[i].name+"</option>";
 }
diff --git a/src/janin.currency.js b/src/janin.currency.js
index 915b426..97af2ba 100644
--- a/src/janin.currency.js
+++ b/src/janin.currency.js
@@ -90,5 +90,3 @@ janin.currencies = [
 
     janin.currency.createCurrency ("Testnet Bitcoin", 0x6f, 0xef, "9", "c", null)
                    ];
-
-janin.selectedCurrency = janin.currencies[1];
diff --git a/src/ninja.onload.js b/src/ninja.onload.js
index 4533470..5e6432e 100644
--- a/src/ninja.onload.js
+++ b/src/ninja.onload.js
@@ -15,6 +15,7 @@ if (ninja.getQueryString()["showseedpool"] == "true" || ninja.getQueryString()["
 	document.getElementById("seedpoolarea").style.display = "block";
 }
 // change currency
+janin.selectedCurrency = janin.currencies[1];
 if (ninja.getQueryString()["currency"] != undefined) {
 	for(i = 0; i < janin.currencies.length; i++) {
 		if (janin.currencies[i].name == ninja.getQueryString()["currency"])
@@ -26,7 +27,7 @@ var select = document.getElementById("currency");
 var options = "";
 for(i = 0; i < janin.currencies.length; i++) {
     options += "<option value='"+i+"'";
-	if(janin.currencies[i].name=="Bitcoin")
+	if(janin.currencies[i].name == janin.currency.name())
 		options += " selected='selected'";
 	options += ">"+janin.currencies[i].name+"</option>";
 }