diff --git a/CHANGELOG b/CHANGELOG
index 2509bbb..07ed111 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.2.16......Disable zfs activation warnings if bastille_zfs_enable is set to NO.
 1.2.15......Minor code changes/improvements.
 1.2.14......Make sure bastille-prefix ends with bastille.
 1.2.13... ..Fallback for custom bastille prefix name.
diff --git a/bastille-init b/bastille-init
old mode 100755
new mode 100644
index e93f2e4..1716eb6
--- a/bastille-init
+++ b/bastille-init
@@ -1286,7 +1286,7 @@ zfs_support_avail()
 zfs_support_disabled()
 {
 	sysrc -f ${CWDIR}${EXTCONF} ZFS_SUPPORT="NO" >/dev/null 2>&1
-	sysrc -f ${CWDIR}${EXTCONF} -x ZFS_ACTIVATED >/dev/null 2>&1
+	sysrc -f ${CWDIR}${EXTCONF} ZFS_ACTIVATED="NO" >/dev/null 2>&1
 }
 
 rc_params()
@@ -1389,7 +1389,7 @@ rc_params()
 		fi
 	else
 		# Check for orphaned configuration and/or config reset.
-		if zfs list -H "${CWDIR}" >/dev/null 2>&1; then
+		if zfs list -H "${CWDIR}" | awk '{print $1}' | grep -qw "${DAFAULT_BASTILLE_PREFIX}"; then
 			zfs_support_error
 		else
 			zfs_support_disabled
diff --git a/version b/version
index 1fc5b82..f69752a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.2.15
+1.2.16