diff --git a/configure.ac b/configure.ac
index 5863244b04083e5af9886df5f3edab36dd7e7d77..cf1140d11329fc2228c866831655984a24d909e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,18 +134,17 @@ AM_COND_IF([ENABLE_PROXY_SERVER], [
 	AC_CHECK_LIB(restbed, exit,, AC_MSG_ERROR([Missing restbed files]))
 	PKG_CHECK_MODULES([Jsoncpp], [jsoncpp >= 1.7.4])
 	CPPFLAGS+=" -DOPENDHT_PROXY_SERVER=true -ljsoncpp -lrestbed"
-
-	AC_ARG_ENABLE([proxy_server_identity], AS_HELP_STRING([--enable-proxy-server-identity],
-		[Enable proxy server ability]), proxy_server_identity=yes, proxy_server_identity=no)
-	AM_CONDITIONAL(ENABLE_PROXY_SERVER_IDENTITY, test x$proxy_server_identity == xyes)
-	AM_COND_IF([ENABLE_PROXY_SERVER_IDENTITY], [
-		CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY=true"
-	], [
-		CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY=false"
-	])
 ], [
 	CPPFLAGS+=" -DOPENDHT_PROXY_SERVER=false"
 ])
+AC_ARG_ENABLE([proxy_server_identity], AS_HELP_STRING([--enable-proxy-server-identity],
+    [Enable proxy server ability]), proxy_server_identity=yes, proxy_server_identity=no)
+AM_CONDITIONAL(ENABLE_PROXY_SERVER_IDENTITY, test x$proxy_server_identity == xyes -a x$proxy_server == xyes)
+AM_COND_IF([ENABLE_PROXY_SERVER_IDENTITY], [
+    CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY=true"
+], [
+    CPPFLAGS+=" -DOPENDHT_PROXY_SERVER_IDENTITY=false"
+])
 
 
 AC_CONFIG_FILES([doc/Doxyfile doc/Makefile])