diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go
index 3aab98a8a9..7a1b15404c 100644
--- a/cmd/puppeth/wizard_genesis.go
+++ b/cmd/puppeth/wizard_genesis.go
@@ -160,8 +160,9 @@ func (w *wizard) makeGenesis() {
 
 		fmt.Println()
 		fmt.Println("How many blocks per epoch? (default = 900)")
-		epochNumber := w.readDefaultInt(900)
-		genesis.Config.XDPoS.RewardCheckpoint = uint64(epochNumber)
+		epochNumber := uint64(w.readDefaultInt(900))
+        genesis.Config.XDPoS.Epoch = genesis.Config.XDPoS.RewardCheckpoint
+		genesis.Config.XDPoS.RewardCheckpoint = epochNumber
 
 		fmt.Println()
 		fmt.Println("How many blocks before checkpoint need to prepare new set of masternodes? (default = 450)")