diff --git a/src/Main.tsx b/src/Main.tsx
index 3afe7a9..2f09304 100644
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -121,6 +121,7 @@ const Main = () => {
           //fallthrough
         case Step.Authentication:
           walletKey.current = await Keycard.exportKeyWithPath(pinRef.current, WALLET_DERIVATION_PATH);
+          await AsyncStorage.setItem("wallet-key", walletKey.current);
           setStep(Step.Home);
           break;
         case Step.Home:
@@ -169,7 +170,7 @@ const Main = () => {
           body: loginReq,
         });
 
-        const respJson = resp.json();
+        const respJson = await resp.json();
         if (respJson['error']) {
           //TODO: handle error
         }
@@ -193,11 +194,17 @@ const Main = () => {
     if (!didMount.current) {
       didMount.current = true;
 
-      const loadPairing = async () => {
+      const loadData = async () => {
         await Keycard.setPairings(await getPairings());
+        const tmp = await AsyncStorage.getItem("wallet-key");
+        walletKey.current = tmp !== null ? tmp : "";
+
+        if (walletKey.current) {
+          setStep(Step.Home);
+        }
       };
 
-      loadPairing().catch(console.log);
+      loadData().catch(console.log);
     }
 
     return () => {
@@ -244,13 +251,19 @@ const Main = () => {
     return true;
   }
 
-  const login = (sessionId: string, challenge: string) => {
+  const login = (sessionId: string, challenge: string, p?: string) => {
+    if (p) {
+      pinRef.current = p;
+    }
+
     sessionRef.current = sessionId;
     challengeRef.current = challenge;
     return connectCard();
   }
 
   const cancel = () => {
+    walletKey.current = "";
+    AsyncStorage.removeItem("wallet-key");
     setStep(Step.Discovery);
   }
 
@@ -269,7 +282,7 @@ const Main = () => {
       {step == Step.Initialization && <InitializationScreen onPressFunc={initPin} onCancelFunc={cancel}></InitializationScreen>}
       {step == Step.Loading && <MnemonicScreen pinRequired={pinRef.current ? false : true} pinRetryCounter={pinDisplayCounter()} onPressFunc={loadMnemonic} onCancelFunc={cancel}></MnemonicScreen>}
       {step == Step.Authentication && <Dialpad pinRetryCounter={pinDisplayCounter()} prompt={"Choose PIN"} onCancelFunc={cancel} onNextFunc={authenticate}></Dialpad>}
-      {step == Step.Home && <HomeScreen walletKey={walletKey.current} onPressFunc={login} onCancelFunc={cancel}></HomeScreen>}
+      {step == Step.Home && <HomeScreen pinRequired={pinRef.current ? false : true} pinRetryCounter={pinDisplayCounter()} walletKey={walletKey.current} onPressFunc={login} onCancelFunc={cancel}></HomeScreen>}
       {step == Step.FactoryReset && <FactoryResetScreen pinRetryCounter={pinDisplayCounter()} onPressFunc={connectCard} onCancelFunc={cancel}></FactoryResetScreen>}
       <NFCModal isVisible={isModalVisible} onChangeFunc={stopNFC}></NFCModal>
     </SafeAreaView>
diff --git a/src/components/steps/HomeScreen.tsx b/src/components/steps/HomeScreen.tsx
index c899d89..d03fac1 100644
--- a/src/components/steps/HomeScreen.tsx
+++ b/src/components/steps/HomeScreen.tsx
@@ -1,30 +1,38 @@
-import {FC, useEffect, useState } from "react";
+import {FC, useEffect, useRef, useState } from "react";
 import { SafeAreaView, StyleSheet, Text, View } from "react-native";
 import Button from "../Button";
 import { Camera, useCameraDevice, useCameraPermission, useCodeScanner } from "react-native-vision-camera";
-import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
+import { hexToBytes } from "@noble/hashes/utils";
 import { bech32 } from "bech32";
 import { ripemd160 } from "@noble/hashes/ripemd160";
 import { sha256 } from "@noble/hashes/sha256";
 import ReceiveModal from "../../ReceiveModal";
+import Dialpad from "../Dialpad";
 
 enum HomeSteps {
   Home,
-  ScanCode
+  ScanCode,
+  InsertPin
 }
 
 type HomeScreenProps = {
+  pinRequired: boolean;
+  pinRetryCounter: number;
   walletKey: string;
-  onPressFunc: (sessionId: string, challenge: string) => void;
+  onPressFunc: (sessionId: string, challenge: string, p?: string) => void;
   onCancelFunc: () => void;
 };
 
 const  HomeScreen: FC<HomeScreenProps> = props => {
-  const {walletKey, onPressFunc, onCancelFunc} = props;
+  const {pinRequired, pinRetryCounter, walletKey, onPressFunc, onCancelFunc} = props;
   const [step, setStep] = useState(HomeSteps.Home);
   const [receiveVisible, setReceiveVisible] = useState(false)
+  const challengeRef = useRef("");
+  const sessionRef = useRef("");
+  
   const cameraDevice = useCameraDevice('back');
   const {hasPermission, requestPermission} = useCameraPermission();
+
   const codeScanner = useCodeScanner({
     codeTypes: ['qr'],
     onCodeScanned: (codes) => {
@@ -39,12 +47,24 @@ const  HomeScreen: FC<HomeScreenProps> = props => {
           return;
         }
 
-        setStep(HomeSteps.Home);
-        onPressFunc(payload["session-id"], payload["challenge"]);
+        challengeRef.current = payload["challenge"];
+        sessionRef.current = payload["session-id"];
+
+        if (pinRequired) {
+          setStep(HomeSteps.InsertPin);
+        } else {
+          onPressFunc(sessionRef.current, challengeRef.current)
+          setStep(HomeSteps.Home);
+        }
       } catch(e) {}
     }
   });
 
+  const submitPin = (p: string) => {
+    onPressFunc(sessionRef.current, challengeRef.current, p);
+    return true;
+  }  
+
   const walletAddress = () => {
     var pubkey = hexToBytes(walletKey);
     if (pubkey[0] == 0x04 && (pubkey.length == 65)) {
@@ -68,19 +88,29 @@ const  HomeScreen: FC<HomeScreenProps> = props => {
     }
   });
 
-  if (step == HomeSteps.Home) {
-    return <SafeAreaView>
+  return <View style={styles.container}>
+    {step == HomeSteps.Home && 
+    <View>
       <Button label="Scan" disabled={false} btnColor="#199515" btnBorderColor="#199515" btnFontSize={17} btnBorderWidth={1} btnWidth="100%" onChangeFunc={() => setStep(HomeSteps.ScanCode)} btnJustifyContent='center'></Button>
       <Button label="Receive" disabled={false} btnColor="#199515" btnBorderColor="#199515" btnFontSize={17} btnBorderWidth={1} btnWidth="100%" onChangeFunc={() => setReceiveVisible(true)} btnJustifyContent='center'></Button>
       <Button label="Cancel" disabled={false} btnColor="#199515" btnBorderColor="#199515" btnFontSize={17} btnBorderWidth={1} btnWidth="100%" onChangeFunc={onCancelFunc} btnJustifyContent='center'></Button>
       <ReceiveModal address={walletAddress()} isVisible={receiveVisible} onChangeFunc={() => {setReceiveVisible(false)} } />
-    </SafeAreaView>
-  } else if (step == HomeSteps.ScanCode) {
-    return <Camera style={StyleSheet.absoluteFill} device={cameraDevice!} isActive={true} codeScanner={codeScanner}/>
-  }
+    </View>
+    }
+    {step == HomeSteps.ScanCode && 
+    <View style={styles.container}>
+      <Camera style={StyleSheet.absoluteFill} device={cameraDevice!} isActive={true} codeScanner={codeScanner}/>
+    </View>
+    }
+    {step == HomeSteps.InsertPin && <Dialpad pinRetryCounter={pinRetryCounter} prompt={"Enter PIN"} onCancelFunc={() => setStep(HomeSteps.Home)} onNextFunc={submitPin}></Dialpad>}
+  </View>    
 };
 
 const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: 'black',
+  },
   heading: {
     textAlign: 'center',
     fontSize: 30,