diff --git a/app.py b/app.py
index 983806d..3dde5e2 100644
--- a/app.py
+++ b/app.py
@@ -3734,7 +3734,7 @@ def qr_checkin(qr_url):
             'message': f'Check-in successful! {checkin_sequence_text} for today.',
             'data': {
                 'employee_id': attendance.employee_id,
-                'location': attendance.location_name,
+                'location': qr_code.location_address,
                 'location_event': qr_code.location_event,
                 'event': qr_code.location_event,  # Add both for compatibility
                 'check_in_time': attendance.check_in_time.strftime('%I:%M %p'),  # 12-hour format
diff --git a/templates/qr_destination.html b/templates/qr_destination.html
index 1b8a88c..2c33660 100644
--- a/templates/qr_destination.html
+++ b/templates/qr_destination.html
@@ -818,12 +818,12 @@
             <i class="fas fa-sign-in-alt"></i>
             <span class="english-text">Check In</span>
             <span class="language-separator">/</span>
-            <span class="spanish-text">Registrar Entrada</span>
+            <span class="spanish-text">Entrada</span>
             {% else %}
             <i class="fas fa-sign-out-alt"></i>
             <span class="english-text">Check Out</span>
             <span class="language-separator">/</span>
-            <span class="spanish-text">Registrar Salida</span>
+            <span class="spanish-text">Salida</span>
             {% endif %}
           </button>
         </form>