diff --git a/handler/auth.go b/handler/auth.go
index ca0f9e1..e656671 100644
--- a/handler/auth.go
+++ b/handler/auth.go
@@ -316,7 +316,7 @@ func (handler AuthImpl) handleChangePasswordComp() http.HandlerFunc {
 
 		err := handler.service.ChangePassword(user, session.Id, currPass, newPass)
 		if err != nil {
-			utils.TriggerToastWithStatus(w, r, "error", "Password not correct", http.StatusBadRequest)
+			utils.TriggerToastWithStatus(w, r, "error", err.Error(), http.StatusBadRequest)
 			return
 		}
 
diff --git a/template/auth/change_password.templ b/template/auth/change_password.templ
index eeacbff..9e761fb 100644
--- a/template/auth/change_password.templ
+++ b/template/auth/change_password.templ
@@ -14,7 +14,7 @@ templ ChangePasswordComp(isPasswordReset bool) {
 			Change Password
 		</h2>
 		if !isPasswordReset {
-			<label class="input input-bordered flex items-center gap-2">
+			<label class="input flex items-center gap-2">
 				<input
 					type="password"
 					class="grow"
@@ -27,7 +27,7 @@ templ ChangePasswordComp(isPasswordReset bool) {
 				/>
 			</label>
 		}
-		<label class="input input-bordered flex items-center gap-2">
+		<label class="input flex items-center gap-2">
 			<input
 				type="password"
 				class="grow"
@@ -39,7 +39,7 @@ templ ChangePasswordComp(isPasswordReset bool) {
 				autocapitalize="off"
 			/>
 		</label>
-		<button class="btn btn-primary self-end">
+		<button class="button button-primary px-2 self-end">
 			Change Password
 		</button>
 	</form>