diff --git a/cmd/main.go b/cmd/main.go
index 186c0e4..694eebb 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"flag"
@@ -29,6 +30,9 @@ const (
 	USERFLAG_INCORRECTPIN
 	USERFLAG_UNLOCKFORUPDATE
 	USERFLAG_INVALID_AMOUNT
+	USERFLAG_QUERYPIN
+	USERFLAG_VALIDPIN
+	USERFLAG_INVALIDPIN
 )
 
 const (
@@ -551,6 +555,62 @@ func (fsd *fsData) quitWithBalance(ctx context.Context, sym string, input []byte
 	return res, nil
 }
 
+func (fsd *fsData) save_pin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	res := resource.Result{}
+	accountPIN := string(input)
+	fp := fsd.path + "_data"
+
+	jsonData, err := os.ReadFile(fp)
+	if err != nil {
+		return res, err
+	}
+
+	var accountData map[string]string
+	err = json.Unmarshal(jsonData, &accountData)
+	if err != nil {
+		return res, err
+	}
+
+	accountData["AccountPIN"] = accountPIN
+
+	updatedJsonData, err := json.Marshal(accountData)
+	if err != nil {
+		return res, err
+	}
+
+	err = os.WriteFile(fp, updatedJsonData, 0644)
+	if err != nil {
+		return res, err
+	}
+
+	return res, nil
+}
+
+func (fsd *fsData) verify_pin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	res := resource.Result{}
+	fp := fsd.path + "_data"
+
+	jsonData, err := os.ReadFile(fp)
+	if err != nil {
+		return res, err
+	}
+
+	var accountData map[string]string
+	err = json.Unmarshal(jsonData, &accountData)
+	if err != nil {
+		return res, err
+	}
+
+	if bytes.Equal(input, []byte(accountData["AccountPIN"])) {
+		res.FlagSet = []uint32{USERFLAG_VALIDPIN}
+		res.FlagReset = []uint32{USERFLAG_INVALIDPIN}
+	} else {
+		res.FlagSet = []uint32{USERFLAG_INVALIDPIN}
+	}
+
+	return res, nil
+}
+
 var (
 	scriptDir = path.Join("services", "registration")
 )
@@ -612,6 +672,8 @@ func main() {
 	}
 	rfs.AddLocalFunc("select_language", fs.SetLanguageSelected)
 	rfs.AddLocalFunc("create_account", fs.create_account)
+	rfs.AddLocalFunc("save_pin", fs.save_pin)
+	rfs.AddLocalFunc("verify_pin", fs.verify_pin)
 	rfs.AddLocalFunc("check_identifier", fs.checkIdentifier)
 	rfs.AddLocalFunc("check_account_status", fs.check_account_status)
 	rfs.AddLocalFunc("unlock_account", fs.unLock)
diff --git a/services/registration/account_creation.vis b/services/registration/account_creation.vis
index b810e1a..e3ecebb 100644
--- a/services/registration/account_creation.vis
+++ b/services/registration/account_creation.vis
@@ -1,4 +1,4 @@
-LOAD create_account 0
+RELOAD verify_pin
+CATCH create_pin_mismatch 20 1
 LOAD quit 0
 HALT
-
diff --git a/services/registration/confirm_create_pin b/services/registration/confirm_create_pin
new file mode 100644
index 0000000..e4632ad
--- /dev/null
+++ b/services/registration/confirm_create_pin
@@ -0,0 +1 @@
+Enter your four number PIN again:
\ No newline at end of file
diff --git a/services/registration/confirm_create_pin.vis b/services/registration/confirm_create_pin.vis
new file mode 100644
index 0000000..1235916
--- /dev/null
+++ b/services/registration/confirm_create_pin.vis
@@ -0,0 +1,4 @@
+LOAD save_pin 0
+HALT
+LOAD verify_pin 8
+INCMP account_creation *
diff --git a/services/registration/confirm_create_pin_swa b/services/registration/confirm_create_pin_swa
new file mode 100644
index 0000000..f697854
--- /dev/null
+++ b/services/registration/confirm_create_pin_swa
@@ -0,0 +1 @@
+Weka PIN yako tena:
\ No newline at end of file
diff --git a/services/registration/create_pin b/services/registration/create_pin
new file mode 100644
index 0000000..f8836f5
--- /dev/null
+++ b/services/registration/create_pin
@@ -0,0 +1 @@
+Please enter a new four number PIN for your account:
\ No newline at end of file
diff --git a/services/registration/create_pin.vis b/services/registration/create_pin.vis
new file mode 100644
index 0000000..852bf47
--- /dev/null
+++ b/services/registration/create_pin.vis
@@ -0,0 +1,5 @@
+LOAD create_account 0
+MOUT exit 0
+HALT
+LOAD save_pin 0
+INCMP confirm_create_pin *
diff --git a/services/registration/create_pin_mismatch b/services/registration/create_pin_mismatch
new file mode 100644
index 0000000..e75068c
--- /dev/null
+++ b/services/registration/create_pin_mismatch
@@ -0,0 +1 @@
+The PIN is not a match. Try again
\ No newline at end of file
diff --git a/services/registration/create_pin_mismatch.vis b/services/registration/create_pin_mismatch.vis
new file mode 100644
index 0000000..91793b5
--- /dev/null
+++ b/services/registration/create_pin_mismatch.vis
@@ -0,0 +1,5 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP confirm_create_pin 1
+INCMP quit 9
diff --git a/services/registration/create_pin_mismatch_swa b/services/registration/create_pin_mismatch_swa
new file mode 100644
index 0000000..a1d7b6d
--- /dev/null
+++ b/services/registration/create_pin_mismatch_swa
@@ -0,0 +1 @@
+PIN uliyoweka haifanani. Jaribu tena
\ No newline at end of file
diff --git a/services/registration/create_pin_swa b/services/registration/create_pin_swa
new file mode 100644
index 0000000..1fdd972
--- /dev/null
+++ b/services/registration/create_pin_swa
@@ -0,0 +1 @@
+Tafadhali weka PIN mpya yenye nambari nne kwa akaunti yako:
\ No newline at end of file
diff --git a/services/registration/exit_menu b/services/registration/exit_menu
new file mode 100644
index 0000000..1105a55
--- /dev/null
+++ b/services/registration/exit_menu
@@ -0,0 +1 @@
+Exit
\ No newline at end of file
diff --git a/services/registration/exit_menu_swa b/services/registration/exit_menu_swa
new file mode 100644
index 0000000..474f1ff
--- /dev/null
+++ b/services/registration/exit_menu_swa
@@ -0,0 +1 @@
+Ondoka
\ No newline at end of file
diff --git a/services/registration/terms.vis b/services/registration/terms.vis
index 5375925..768efa3 100644
--- a/services/registration/terms.vis
+++ b/services/registration/terms.vis
@@ -3,5 +3,5 @@ RELOAD select_language
 MOUT yes 0
 MOUT no 1
 HALT
-INCMP account_creation 0
+INCMP create_pin 0
 INCMP _ *