diff --git a/src/index.html b/src/index.html
index f495bad..205ccd5 100644
--- a/src/index.html
+++ b/src/index.html
@@ -130,7 +130,7 @@
 
 		<div id="currencyddl" class="hide">
 			Choose currency :
-      		<select id="currency" onchange="janin.currency.useCurrency(this);"></select> 
+      		<select id="currency" onchange="janin.currency.useCurrency(this.selectedIndex);"></select> 
 		</div>
 		
 		<div id="seedpoolarea"><textarea rows="16" cols="62" id="seedpool"></textarea></div>
diff --git a/src/janin.currency.js b/src/janin.currency.js
index 67fb6f9..6922638 100644
--- a/src/janin.currency.js
+++ b/src/janin.currency.js
@@ -32,12 +32,10 @@ janin.currency = {
         return new RegExp("^" + janin.selectedCurrency.CWIF_Start + "[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$");
     },
     
-    useCurrency: function(currency) {
-        janin.selectedCurrency = currency;
-        
-        // TODO: regenerate/reset current wallet (single, vanity ...)
+    // Switch currency
+    useCurrency: function(index) {
+        janin.selectedCurrency = janin.currencies[index];
     },
-    
 };
 
 janin.currencies = [