diff --git a/src/main.js b/src/main.js
index f0c0676..9b3a77e 100755
--- a/src/main.js
+++ b/src/main.js
@@ -284,11 +284,16 @@ var App = {
 			this.$('datasource').className = null;
 		};
 		var odbcPath = this.getOdbcPath();
-		this.$('user').value = this.regRead(odbcPath, 'UID')
-		this.$('password').value = this.regRead(odbcPath, 'PWD')
+
+		var user = this.regRead(odbcPath, 'UID')
+		if (user)
+			this.$('user').value = this.regRead(odbcPath, 'UID')
+
+		var password = this.regRead(odbcPath, 'PWD')
+		if (password)
+		this.$('password').value = password
 
 		this.refreshLogout();
-
 		this.$('user').focus();
 	},
 	cleanCache: function() {