diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index aae9c12..1c4d93a 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -415,7 +415,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 			const identitySharedKey = Curve.sharedKey(authState.creds.signedIdentityKey.private, primaryIdentityPublicKey)
 			const identityPayload = Buffer.concat([companionSharedKey, identitySharedKey, random])
 			authState.creds.advSecretKey = hkdf(identityPayload, 32, { info: 'adv_secret' }).toString('base64')
-			await sendNode({
+			await query({
 				tag: 'iq',
 				attrs: {
 					to: S_WHATSAPP_NET,
@@ -451,6 +451,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 				]
 			})
 			authState.creds.registered = true
+			ev.emit('creds.update', authState.creds)
 		}
 
 		if(Object.keys(result).length) {
diff --git a/src/Socket/socket.ts b/src/Socket/socket.ts
index e599daa..7dcd409 100644
--- a/src/Socket/socket.ts
+++ b/src/Socket/socket.ts
@@ -70,7 +70,7 @@ export const makeSocket = (config: SocketConfig) => {
 
 	let url = typeof waWebSocketUrl === 'string' ? new URL(waWebSocketUrl) : waWebSocketUrl
 
-	config.mobile = config.mobile || config.auth?.creds?.registered || url.protocol === 'tcp:'
+	config.mobile = config.mobile || url.protocol === 'tcp:'
 
 	if(config.mobile && url.protocol !== 'tcp:') {
 		url = new URL(`tcp://${MOBILE_ENDPOINT}:${MOBILE_PORT}`)
@@ -488,6 +488,7 @@ export const makeSocket = (config: SocketConfig) => {
 			id: jidEncode(phoneNumber, 's.whatsapp.net'),
 			name: '~'
 		}
+		ev.emit('creds.update', authState.creds)
 		await sendNode({
 			tag: 'iq',
 			attrs: {