diff --git a/js/app/directives/otp.js b/js/app/directives/otp.js
index d8ad8a92..69e5b608 100644
--- a/js/app/directives/otp.js
+++ b/js/app/directives/otp.js
@@ -52,16 +52,12 @@
 						var val = base32chars.indexOf(base32.charAt(i).toUpperCase());
 						bits += leftpad(val.toString(2), 5, '0');
 					}
-					
-					for (i = i % 8; i > 0; i--) {
-						bits += leftpad('0', 5, '0');
-					}
 
 					for (i = 0; i + 4 <= bits.length; i += 4) {
 						var chunk = bits.substr(i, 4);
 						hex = hex + parseInt(chunk, 2).toString(16);
 					}
-					return hex;
+					return hex.length % 2 ? hex + "0" : hex;
 
 				}
 
@@ -128,4 +124,4 @@
 				};
 			}
 		]);
-}());
\ No newline at end of file
+}());