diff --git a/src/account.cpp b/src/account.cpp
index 8f31e0ffa293e6f4cae5857f93514c3eb634fb6f..75cc6c1618d45709bc7d51ef5da048ff56ab0539 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -37,14 +37,14 @@ void
 Account::loadConfig()
 {
 	std::string p =  Manager::instance().getConfigString( _accountID , CONFIG_ACCOUNT_TYPE );
-	if( IAX2_ENABLED )
+#ifdef USE_IAX	
 	  _enabled = Manager::instance().getConfigInt(_accountID, CONFIG_ACCOUNT_ENABLE) ? true : false;
-	else {
+#else
 	if( p.c_str() == "IAX" )
-	{_enabled = false;}
+	  _enabled = false;
 	else
-	{_enabled = Manager::instance().getConfigInt(_accountID, CONFIG_ACCOUNT_ENABLE) ? true : false;}
-	}
+	  _enabled = Manager::instance().getConfigInt(_accountID, CONFIG_ACCOUNT_ENABLE) ? true : false;
+#endif
 }
 
 // NOW
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 696505a4247f0ea2d2d4c6b236a4486c61f3b567..70195360dd32fefa5237554175b6fb975bafe462 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -1352,7 +1352,12 @@ ManagerImpl::getCurrentAudioDevicesIndex()
 int 
 ManagerImpl::isIax2Enabled( void )
 {
-  return ( IAX2_ENABLED ) ? true : false;
+  //return ( IAX2_ENABLED ) ? true : false;
+#ifdef USE_IAX
+  return true;
+#else
+  return false;
+#endif
 }
 
   int