diff --git a/src/extauth.erl b/src/extauth.erl
index b9d472408..170dc23a0 100644
--- a/src/extauth.erl
+++ b/src/extauth.erl
@@ -128,7 +128,7 @@ handle_call({cmd, Cmd, EndTime}, _From, State) ->
 		{'EXIT', Port, Reason} ->
 		    handle_info({'EXIT', Port, Reason}, State)
 	    after Timeout ->
-		    {stop, extauth_program_timeout, State}
+		    {stop, normal, State}
 	    end;
        true ->
 	    {noreply, State}
@@ -148,7 +148,7 @@ handle_info({'EXIT', Port, _Reason}, #state{port = Port,
 	    ?ERROR_MSG("External authentication program '~s' has terminated "
 		       "unexpectedly (pid=~w), restarting via supervisor...",
 		       [State#state.prog, State#state.os_pid]),
-	    {stop, extauth_program_failure, State}
+	    {stop, normal, State}
     end;
 handle_info(Info, State) ->
     ?WARNING_MSG("Unexpected info: ~p", [Info]),
diff --git a/src/extauth_sup.erl b/src/extauth_sup.erl
index 882c47df5..c9dc0cdff 100644
--- a/src/extauth_sup.erl
+++ b/src/extauth_sup.erl
@@ -107,4 +107,4 @@ init([Host, Prog, Pool]) ->
 worker_spec(Pool, Prog, I) ->
     Worker = extauth:worker_name(Pool, I),
     {Worker, {extauth, start_link, [Worker, Prog]},
-     transient, 5000, worker, [extauth]}.
+     permanent, 5000, worker, [extauth]}.