diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 23ffa53d92917d3d4358c8c3ab08b8f8e269f781..2d9a5fbfc24e3100625b546255ca67f1d9f35800 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -33,9 +33,11 @@
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Elements/MUCPayload.h"
 #include "Swiften/Elements/ChatState.h"
-#ifndef __FreeBSD__
+#ifndef __FreeBSD__ 
+#ifndef __MACH__
 #include "malloc.h"
 #endif
+#endif
 // #include "valgrind/memcheck.h"
 
 namespace Transport {
@@ -130,9 +132,11 @@ void UserManager::removeUser(User *user, bool onUserBehalf) {
 	delete user;
 #ifndef WIN32
 #ifndef __FreeBSD__
+#ifndef __MACH__
 	malloc_trim(0);
 #endif
 #endif
+#endif
 // 	VALGRIND_DO_LEAK_CHECK;
 }
 
@@ -248,8 +252,8 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {
 		// We allow auto_register feature in gateway-mode. This allows IRC user to register
 		// the transport just by joining the room.
 		if (!m_component->inServerMode()) {
-			if (!registered && (CONFIG_BOOL(m_component->getConfig(), "registration.auto_register") ||
-				!CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", true))) {
+			if (!registered && (CONFIG_BOOL(m_component->getConfig(), "registration.auto_register")
+				/*!CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", true)*/)) {
 				res.password = "";
 				res.jid = userkey;