diff --git a/lib/RegisterPage.dart b/lib/RegisterPage.dart
index 3459bba..63295b8 100644
--- a/lib/RegisterPage.dart
+++ b/lib/RegisterPage.dart
@@ -111,6 +111,7 @@ class _RegisterPageState extends State<RegisterPage> {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(content: Text('請輸入正確的電子信箱')),
       );
+      _emailFocusNode.requestFocus();
       return;
     }
 
@@ -119,6 +120,46 @@ class _RegisterPageState extends State<RegisterPage> {
     _startTimer();
   }
 
+  bool _isDataCorrect() {
+    String name = _nameController.text;
+    String email = _emailController.text;
+    String password = _passwordController.text;
+    String code = _codeController.text;
+
+    if (name == ''){
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('用戶姓名不可為空')),
+      );
+      _nameFocusNode.requestFocus();
+      return false;
+    }
+
+    if (email == ''){
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('電子信箱不可為空')),
+      );
+      _emailFocusNode.requestFocus();
+      return false;
+    }
+
+    if (password== ''){
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('密碼不可為空')),
+      );
+      _passwordFocusNode.requestFocus();
+      return false;
+    }
+
+    if (code != _generatedCode){
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('驗證碼錯誤')),
+      );
+      _codeFocusNode.requestFocus();
+      return false;
+    }
+    return true;
+  }
+
   void registerBtn() async {
     if (!_isDataCorrect()) return;
     final conn = await MySQLConnection.createConnection(