   // Show the numkey to enter a password
   // The numkey event handler will verify the password
   // and change the screen if the password is correct
-  
-  terminal.clear();
-  terminal.print("Enter the numeric password:");
-  terminal.print("1234",GREEN);
-  canvas.add(&numkey,60,45);
+  if(!passwordCorrect){
+    terminal.clear();
+    terminal.print("Enter the numeric password:");
+    terminal.print("1234",GREEN);
+    canvas.add(&numkey,60,45);
+  }else{
+    numkeyEventHandler(&numkey);
+  }
 }
 
 void btnButtonsEventHandler(Button* btn){

#include <Terminal.h>
#include <Display.h>
#include <Button.h>
#include <Dial.h>
#include <Numkey.h>
#include <IconButton.h>

  dial.setLowLimit(70,BLUE);
  dial.setCV(72,false);

  screen_dial.add(&dial,80,screen_dial.h/2);
	screen_dial.add(&slider,170,20);
	
  // ===== SCREEN THREE - BUTTONS  =====  
  screen_buttons.bgColor = BG_COLOR;

