diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c534998..8938ea5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,4 +34,3 @@ jobs:
             lightdm-hvl-greeter_${{ env.VERSION }}_amd64.deb
           name: "Release ${{ env.VERSION }}"
           tag_name: "v${{ env.VERSION }}"
-          prerelease: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9245a9..b9553fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 project(hvl-lightdm-greeter)
 add_subdirectory(src)
-find_package(Qt5 5.11 REQUIRED COMPONENTS Core)
 
 install(FILES  hvl-lightdm-greeter.desktop  DESTINATION /usr/share/xgreeters)
 install(FILES hvl-lightdm-greeter.conf DESTINATION /usr/share/lightdm/lightdm-hvl-greeter.conf.d)
diff --git a/VERSION b/VERSION
index d0cdf89..280cb16 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.97.9
\ No newline at end of file
+0.98.0
\ No newline at end of file
diff --git a/src/loginform.ui b/src/loginform.ui
index d9243cc..cae1beb 100644
--- a/src/loginform.ui
+++ b/src/loginform.ui
@@ -1538,7 +1538,7 @@ QPushButton:hover{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::StrongFocus</enum>
           </property>
           <property name="text">
            <string/>
@@ -1572,7 +1572,7 @@ QPushButton:hover{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::StrongFocus</enum>
           </property>
           <property name="text">
            <string/>
@@ -1612,7 +1612,7 @@ QPushButton:hover{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::StrongFocus</enum>
           </property>
           <property name="text">
            <string/>
@@ -1649,6 +1649,9 @@ QPushButton:hover{
             <height>20</height>
            </rect>
           </property>
+          <property name="focusPolicy">
+           <enum>Qt::NoFocus</enum>
+          </property>
           <property name="text">
            <string/>
           </property>
@@ -1666,6 +1669,9 @@ QPushButton:hover{
             <height>20</height>
            </rect>
           </property>
+          <property name="focusPolicy">
+           <enum>Qt::NoFocus</enum>
+          </property>
           <property name="text">
            <string/>
           </property>
@@ -1683,6 +1689,9 @@ QPushButton:hover{
             <height>20</height>
            </rect>
           </property>
+          <property name="focusPolicy">
+           <enum>Qt::NoFocus</enum>
+          </property>
           <property name="text">
            <string/>
           </property>
@@ -1756,7 +1765,7 @@ QPushButton:hover{
               </size>
              </property>
              <property name="focusPolicy">
-              <enum>Qt::NoFocus</enum>
+              <enum>Qt::ClickFocus</enum>
              </property>
              <property name="text">
               <string>Reset Password</string>