diff --git a/makerom/cia.c b/makerom/cia.c
index 7d53932..f3db6be 100644
--- a/makerom/cia.c
+++ b/makerom/cia.c
@@ -182,7 +182,12 @@ int GetSettingsFromUsrset(cia_settings *ciaset, user_settings *usrset)
 	}
 
 	// Ticket Data
-	rndset(ciaset->tik.ticketId,16);
+	rndset(ciaset->tik.ticketId,8);
+	clrmem(ciaset->tik.deviceId,4);
+	clrmem(ciaset->tik.eshopAccId,4);
+	ciaset->tik.licenceType = 0;
+	ciaset->tik.audit = 0;
+	
 	if(usrset->cia.randomTitleKey)
 		rndset(ciaset->common.titleKey,16);
 	else
diff --git a/makerom/cia.h b/makerom/cia.h
index 57bc0ba..6907dea 100644
--- a/makerom/cia.h
+++ b/makerom/cia.h
@@ -62,7 +62,7 @@ typedef struct
 		u16 version;
 
 		u8 ticketId[8];
-		u8 deviceId[8];
+		u8 deviceId[4];
 		u8 licenceType;
 		u8 audit;
 		u8 eshopAccId[4];
diff --git a/makerom/tik.c b/makerom/tik.c
index ea312f0..ba95e23 100644
--- a/makerom/tik.c
+++ b/makerom/tik.c
@@ -50,7 +50,7 @@ int SetupTicketHeader(tik_hdr *hdr, cia_settings *ciaset)
 	else
 		rndset(hdr->encryptedTitleKey,16);
 	memcpy(hdr->ticketId,ciaset->tik.ticketId,8);
-	memcpy(hdr->deviceId,ciaset->tik.deviceId,8);
+	memcpy(hdr->deviceId,ciaset->tik.deviceId,4);
 	memcpy(hdr->titleId,ciaset->common.titleId,8);
 	u16_to_u8(hdr->ticketVersion,ciaset->tik.version,BE);
 	hdr->licenceType = ciaset->tik.licenceType;