diff --git a/openbsc/include/openbsc/signal.h b/openbsc/include/openbsc/signal.h
index 0dc1772..1af8496 100644
--- a/openbsc/include/openbsc/signal.h
+++ b/openbsc/include/openbsc/signal.h
@@ -83,7 +83,6 @@
 enum signal_subscr {
 	S_SUBSCR_ATTACHED,
 	S_SUBSCR_DETACHED,
-	S_SUBSCR_FIRST_CONTACT,
 };
 
 typedef int signal_cbfn(unsigned int subsys, unsigned int signal,
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c
index 65940a0..98f2d56 100644
--- a/openbsc/src/gsm_04_08.c
+++ b/openbsc/src/gsm_04_08.c
@@ -329,9 +329,10 @@
 	switch (subscriber->net->auth_policy) {
 	case GSM_AUTH_POLICY_CLOSED:
 		return subscriber->authorized;
+	case GSM_AUTH_POLICY_TOKEN:
+		return (subscriber->flags & GSM_SUBSCRIBER_FIRST_CONTACT);
 	case GSM_AUTH_POLICY_ACCEPT_ALL:
 		return 1;
-	case GSM_AUTH_POLICY_TOKEN:
 	default:
 		return 0;
 	}
@@ -1152,12 +1153,8 @@
 		/* look up subscriber based on IMSI, create if not found */
 		if (!lchan->subscr) {
 			lchan->subscr = subscr_get_by_imsi(net, mi_string);
-		}
-		if (!lchan->subscr) {
-			lchan->subscr = db_create_subscriber(net, mi_string);
-			if (lchan->subscr->flags & GSM_SUBSCRIBER_FIRST_CONTACT) {
-				dispatch_signal(SS_SUBSCR, S_SUBSCR_FIRST_CONTACT, &lchan->subscr);
-			}
+			if (!lchan->subscr)
+				lchan->subscr = db_create_subscriber(net, mi_string);
 		}
 		if (lchan->loc_operation)
 			lchan->loc_operation->waiting_for_imsi = 0;
@@ -1254,9 +1251,6 @@
 		if (!subscr) {
 			subscr = db_create_subscriber(bts->network, mi_string);
 		}
-		if (subscr->flags & GSM_SUBSCRIBER_FIRST_CONTACT) {
-			dispatch_signal(SS_SUBSCR, S_SUBSCR_FIRST_CONTACT, &subscr);
-		}
 		break;
 	case GSM_MI_TYPE_TMSI:
 		DEBUGPC(DMM, "\n");
diff --git a/openbsc/src/gsm_04_11.c b/openbsc/src/gsm_04_11.c
index 1dc68d0..5070b54 100644
--- a/openbsc/src/gsm_04_11.c
+++ b/openbsc/src/gsm_04_11.c
@@ -970,18 +970,6 @@
 		/* Establish a SAPI3 RLL connection for SMS */
 		rll_establish(lchan, UM_SAPI_SMS, rll_ind_cb, sms);
 		break;
-	case S_SUBSCR_FIRST_CONTACT:
-		/* A new subscriber has just been created in the DB */
-		subscr = signal_data;
-		if (subscr->net->auth_policy == GSM_AUTH_POLICY_TOKEN) {
-			if (db_subscriber_alloc_token(subscr, &token)) {
-				/* error: probably use already has a token */
-				break;
-			} else {
-				/* FIXME: send sms with token here */
-			}
-		}
-		break;
 	default:
 		break;
 	}