diff --git a/src/gsm.c b/src/gsm.c
index 427fe09..6916dd1 100644
--- a/src/gsm.c
+++ b/src/gsm.c
@@ -923,12 +923,7 @@ static int _parse_do(GSM * gsm, size_t * i)
 		gsm->mode = GSM_MODE_COMMAND;
 		gsm_modem_set_echo(gsm->modem, FALSE);
 		gsm_modem_set_verbose(gsm->modem, TRUE);
-		/* XXX should probably not be set by us */
 		gsm_modem_set_extended_errors(gsm->modem, TRUE);
-		gsm_modem_set_extended_ring_reports(gsm->modem, TRUE);
-		gsm_modem_set_call_presentation(gsm->modem, TRUE);
-		gsm_modem_set_supplementary_service_notifications(gsm->modem,
-				TRUE, TRUE);
 		gsm_modem_get_model(gsm->modem);
 		_gsm_event_set_status(gsm, GSM_STATUS_INITIALIZED);
 		_gsm_queue_push(gsm);
diff --git a/src/phone.c b/src/phone.c
index 8ddcae4..d50d957 100644
--- a/src/phone.c
+++ b/src/phone.c
@@ -2178,9 +2178,13 @@ static int _phone_gsm_event(GSMEvent * event, gpointer data)
 				gsm_set_functional(phone->gsm, TRUE);
 				return 0;
 			}
+			gsm_set_call_presentation(phone->gsm, TRUE);
+			gsm_set_extended_ring_reports(phone->gsm, TRUE);
 			gsm_set_operator_mode(phone->gsm,
 					GSM_OPERATOR_MODE_AUTOMATIC);
 			gsm_set_registration_report(phone->gsm, report);
+			gsm_set_supplementary_service_notifications(phone->gsm,
+					TRUE, TRUE);
 			gsm_is_phone_active(phone->gsm);
 #ifndef DEBUG
 			_phone_track(phone, PHONE_TRACK_CONTACT_LIST, TRUE);