diff --git a/type/__dma_auth/explorer/state b/type/__dma_auth/explorer/state
index 18e13ce..0e6f7be 100755
--- a/type/__dma_auth/explorer/state
+++ b/type/__dma_auth/explorer/state
@@ -64,7 +64,7 @@ BEGIN {
 	host = substr($0, length(login) + 2)
 
 	if (match(host, DP)) {
-		passwd = substr(host, RSTART)
+		passwd = substr(host, RSTART + 1)
 		host = substr(host, 1, RSTART - 1)
 	} else {
 		passwd = ""
diff --git a/type/__dma_auth/gencode-remote b/type/__dma_auth/gencode-remote
index 262a17a..c49779f 100755
--- a/type/__dma_auth/gencode-remote
+++ b/type/__dma_auth/gencode-remote
@@ -99,7 +99,10 @@ BEGIN {
 }
 
 # skip comments and empty lines
-/^#/ || /^$/ { print; next }
+/^#/ || /^$/ {
+	print
+	next
+}
 
 {
 	# parse line
@@ -110,7 +113,7 @@ BEGIN {
 	host = substr($0, length(login) + 2)
 
 	if (match(host, DP)) {
-		passwd = substr(host, RSTART)
+		passwd = substr(host, RSTART + 1)
 		host = substr(host, 1, RSTART - 1)
 	} else {
 		passwd = ""