diff --git a/package/confd/confd.mk b/package/confd/confd.mk
index cb379b82..09bc306c 100644
--- a/package/confd/confd.mk
+++ b/package/confd/confd.mk
@@ -13,12 +13,6 @@ CONFD_LICENSE_FILES = LICENSE
 CONFD_DEPENDENCIES = augeas jansson libite sysrepo
 CONFD_AUTORECONF = YES
 
-ifeq ($(BR2_SYSTEM_BIN_SH_BASH),y)
-CONFD_CONF_OPTS += --with-login-shell=/bin/bash
-else
-CONFD_CONF_OPTS += --with-login-shell=/bin/sh
-endif
-
 define CONFD_INSTALL_EXTRA
 	cp $(CONFD_PKGDIR)/sysrepo.conf  $(FINIT_D)/available/
 	ln -sf ../available/sysrepo.conf $(FINIT_D)/enabled/sysrepo.conf
diff --git a/src/confd/configure.ac b/src/confd/configure.ac
index 1e347393..dbed2834 100644
--- a/src/confd/configure.ac
+++ b/src/confd/configure.ac
@@ -22,13 +22,13 @@ AC_REPLACE_FUNCS(asprintf)
 
 # Check feature flags
 AC_ARG_WITH(login-shell,
-        AS_HELP_STRING([--with-login-shell=shell], [Login shell for new users, default: /bin/sh]),
+        AS_HELP_STRING([--with-login-shell=shell], [Login shell for new users, default: /bin/false]),
 	[login_shell=$withval], [login_shell=yes])
 
 AS_IF([test "x$with_login_shell" != "xno"], [
-	AS_IF([test "x$login_shell" = "xyes"], [login_shell=/bin/sh])
-	AC_DEFINE_UNQUOTED(LOGIN_SHELL, "$login_shell", [Default: /bin/sh])],[
-	AC_DEFINE_UNQUOTED(LOGIN_SHELL, "/bin/sh")])
+	AS_IF([test "x$login_shell" = "xyes"], [login_shell=/bin/false])
+	AC_DEFINE_UNQUOTED(LOGIN_SHELL, "$login_shell", [Default: /bin/false])],[
+	AC_DEFINE_UNQUOTED(LOGIN_SHELL, "/bin/false")])
 
 # Check for pkg-config first, warn if it's not installed
 PKG_PROG_PKG_CONFIG