diff --git a/apps/member/forms.py b/apps/member/forms.py
index 66844cf4f37b3c0ebedc9625ea9beb9158dd714c..abb35cd9cb2d4493e849ffcfd9315a5f14230c4a 100644
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -14,6 +14,11 @@ from crispy_forms.layout import Layout
 
 
 class SignUpForm(UserCreationForm):
+    def __init__(self,*args,**kwargs):
+        super().__init__(*args,**kwargs)
+        self.fields['username'].widget.attrs.pop("autofocus", None)
+        self.fields['first_name'].widget.attrs.update({"autofocus":"autofocus"})
+
     class Meta:
         model = User
         fields = ['first_name', 'last_name', 'username', 'email']
diff --git a/templates/member/signup.html b/templates/member/signup.html
index 4e6f79bcc219239830edcfab4426930e7d064513..e682bd9b8be5c6c327f8b17cdf4d7a7f07a3da96 100644
--- a/templates/member/signup.html
+++ b/templates/member/signup.html
@@ -10,7 +10,7 @@
       {% csrf_token %}
       {{ form|crispy }}
       {{ profile_form|crispy }}
-      <button class="btn btn-link" type="submit">
+      <button class="btn btn-success" type="submit">
           {% trans "Sign Up" %}
       </button>
   </form>