diff --git a/autogen.sh b/autogen.sh
index e506185f..85e17395 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,6 +23,7 @@ do_cmd() {
 }
 
 test -f configure.ac || die "No configure.ac found."
+which pkg-config > /dev/null || die "ERROR: pkg-config not found. Install pkg-config and run $0 again"
 
 # Generate aclocal.m4 for use by autoconf
 do_cmd $ACLOCAL    $ACLOCAL_FLAGS
@@ -31,12 +32,6 @@ do_cmd $AUTOHEADER $AUTOHEADER_FLAGS
 # Generate configure
 do_cmd $AUTOCONF   $AUTOCONF_FLAGS
 
-if grep PKG_CHECK_MODULES configure > /dev/null
-then
-	rm configure
-	die "ERROR: pkg-config not found. Install pkg-config and run $0 again"
-fi
-
 # Copy config.sub, config.guess, install.sh, ...
 # This will complain that we don't use automake, let's just ignore that
 do_cmd $AUTOMAKE   $AUTOMAKE_FLAGS || true
diff --git a/src/Client.cpp b/src/Client.cpp
index 1c6c924b..ba3019b3 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -853,7 +853,7 @@ CString CClient::GetNickMask() const {
 		sHost = "irc.znc.in";
 	}
 
-	return GetNick() + "!" + (m_pNetwork ? m_pNetwork->GetBindHost() : m_pUser->GetIdent()) + "@" + sHost;
+	return GetNick() + "!" + (m_pNetwork ? m_pNetwork->GetIdent() : m_pUser->GetIdent()) + "@" + sHost;
 }
 
 bool CClient::IsValidIdentifier(const CString& sIdentifier) {