diff --git a/sysutils/ttyd/Makefile b/sysutils/ttyd/Makefile
index 31d6e41b6ece..0586e9ffe284 100644
--- a/sysutils/ttyd/Makefile
+++ b/sysutils/ttyd/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	ttyd
 DISTVERSION=	1.7.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Program to share your terminal over the web
 WWW=		https://github.com/tsl0922/ttyd
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	xxd:sysutils/xxd
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libuv.so:devel/libuv \
 		libwebsockets.so:net/libwebsockets
 
 USES=		cmake pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	tsl0922
 USE_RC_SUBR=	${PORTNAME}
 
 CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=True
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/ttyd.1.gz
 
 .include <bsd.port.mk>
diff --git a/sysutils/ttyd/files/ttyd.in b/sysutils/ttyd/files/ttyd.in
index 56b8188deeda..15c108eca492 100755
--- a/sysutils/ttyd/files/ttyd.in
+++ b/sysutils/ttyd/files/ttyd.in
@@ -1,30 +1,30 @@
 #!/bin/sh
 
 # PROVIDE: ttyd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # ttyd_enable (bool):        Set to NO by default. Set it to YES to enable ttyd.
 # ttyd_acct (string):        Default user to run ttyd under, "nobody"
 # ttyd_exec (string):        Default command to run in ttyd, "/bin/sh"
 # ttyd_args (string):        Extra arguments passed to ttyd.
 #                            Default is "--interface lo0 --port 7681"
 
 . /etc/rc.subr
 
 name=ttyd
 rcvar=ttyd_enable
 
 load_rc_config $name
 
 : ${ttyd_enable:="NO"}
 : ${ttyd_acct:="nobody"}
-: ${ttyd_exec:="/bin/sh"}
-: ${ttyd_args:="--interface lo0 --port 7681"}
+: ${ttyd_exec:="/usr/bin/login"}
+: ${ttyd_args:="--interface lo0 --port 7681 -W"}
 
 procname="/usr/local/bin/${name}"
 
 command="/usr/sbin/daemon"
 command_args="-r -R 15 -f -t ${name} -T ttyd -u ${ttyd_acct} /usr/local/bin/ttyd ${ttyd_args} ${ttyd_exec}"
 
 run_rc_command "$1"