diff --git a/src/NFCHandler.ts b/src/NFCHandler.ts
index 739e1fb..5e10f74 100644
--- a/src/NFCHandler.ts
+++ b/src/NFCHandler.ts
@@ -67,9 +67,9 @@ export default class NFCHandler {
             let contents = fs.readFileSync(path.resolve(process.cwd(), "nfc.test")).toString("utf-8");
             let parsed = this.formClass("xyz", contents);
             if (parsed)
-                IPCSend(IPCListenChannels.NFC_CARD, {status: true, data: parsed});
+                IPCSend(IPCListenChannels.NFC_CARD, {status: true, data: parsed.card});
 
-            IPCSend(IPCListenChannels.NFC_RAW, {status: !!parsed, data: parsed});
+            IPCSend(IPCListenChannels.NFC_RAW, {status: parsed.isComplete, data: parsed.card});
 
             console.log("Got NFC", parsed);
         })
diff --git a/src/web/Setup.tsx b/src/web/Setup.tsx
index ea6c1f6..4f2aed2 100644
--- a/src/web/Setup.tsx
+++ b/src/web/Setup.tsx
@@ -289,12 +289,13 @@ export default class Setup extends Component<{}, InitialSetupState> {
             }));
     }
 
-    private nfcCard: NFCCard|null;
-    onNFCRawEvent = (card: NFCCard|null) => {
-        this.nfcCard = card;
+
+    onNFCRawEvent = (card: NFCCard|null, isComplete: boolean) => {
         this.setState(prevState => ({
             ...prevState,
             openNFCModal: true,
+            nfcCard: card,
+            validCard: isComplete
         }));
     }
 
@@ -303,7 +304,7 @@ export default class Setup extends Component<{}, InitialSetupState> {
     componentDidMount() {
         this.getSettings().then();
         this.rawNFCListener = IPCListener.attach(IPCListenChannels.NFC_RAW, (message) => {
-            this.onNFCRawEvent(message.data);
+            this.onNFCRawEvent(message.data, message.status);
         })
     }
 
@@ -338,7 +339,7 @@ export default class Setup extends Component<{}, InitialSetupState> {
 
 
             {this.state.openNFCModal &&
-            <CardSetup card={this.state.nfcCard} validCard={this.state.validNfcCard} closeCallback={() => this.setState(prevState => ({
+            <CardSetup card={this.state.nfcCard} validCard={this.state.validCard} closeCallback={() => this.setState(prevState => ({
                 ...prevState,
                 openNFCModal: false
             }))}/>}