diff --git a/index.html b/index.html
index 2352c53..80211fb 100644
--- a/index.html
+++ b/index.html
@@ -602,7 +602,7 @@
 				</div>
 
 				<div class="modal-body" align="center">
-					<img src="https://chart.googleapis.com/chart?chs=250x250&cht=qr&chl=bitcoin:16fjHscBwW4NxSWzGCPdkPyWnoARUpkwSA" id="qrcode">
+					<div id="qrcode"></div>
 				</div>
 
 				<div class="modal-footer">
diff --git a/js/coinbin.js b/js/coinbin.js
index 1ea7ab5..6959429 100644
--- a/js/coinbin.js
+++ b/js/coinbin.js
@@ -28,6 +28,7 @@ $(document).ready(function() {
 					$("#walletAddress").html(keys.address);
 					$("#walletHistory").attr('href','https://btc.blockr.io/address/info/'+keys.address);
 
+					$("#walletQrCode").html("");
 					var qrcode = new QRCode("walletQrCode");
 					qrcode.makeCode("bitcoin:"+keys.address);
 
@@ -63,6 +64,7 @@ $(document).ready(function() {
 		$("#walletAddress").html("");
 		$("#walletHistory").attr('href','https://btc.blockr.io/address/info/');
 
+		$("#walletQrCode").html("");
 		var qrcode = new QRCode("walletQrCode");
 		qrcode.makeCode("bitcoin:");
 
@@ -676,9 +678,10 @@ $(document).ready(function() {
 	/* page load code */
 
 	$(".qrcodeBtn").click(function(){
+		$("#qrcode").html("");
 		var thisbtn = $(this).parent().parent();
 		var qrcode = new QRCode("qrcode");
-		qrcode.makeCode("bitcoin:"+keys.address);
+		qrcode.makeCode("bitcoin:"+$('.address',thisbtn).val());
 	});
 
 	$('input[title!=""], abbr[title!=""]').tooltip({'placement':'bottom'});