diff --git a/frontend/src/pages/TimeClockPage.css b/frontend/src/pages/TimeClockPage.css
index 2758bcd..759d96a 100644
--- a/frontend/src/pages/TimeClockPage.css
+++ b/frontend/src/pages/TimeClockPage.css
@@ -90,6 +90,7 @@
 .time-entry-form {
   background-color: #f8f9fa;
   padding: 20px;
+  border: 1px solid var(--accent);
   border-radius: 8px;
   margin: 20px 0;
 }
diff --git a/frontend/src/pages/TimeClockPage.jsx b/frontend/src/pages/TimeClockPage.jsx
index cd74f67..ab2befa 100644
--- a/frontend/src/pages/TimeClockPage.jsx
+++ b/frontend/src/pages/TimeClockPage.jsx
@@ -256,13 +256,6 @@ const TimeClockPage = () => {
         </button>
       )}
 
-      {scanResult && (
-        <div className="alert alert-success scan-success">
-          QR code détecté : <strong>{scanResult}</strong>
-          <span>Le pointage sera relié à votre session dans la prochaine étape.</span>
-        </div>
-      )}
-
       {/* Time tracking section */}
       <div className="time-tracking-section">
         
@@ -271,42 +264,83 @@ const TimeClockPage = () => {
           <p>Heure actuelle: {currentTime.toLocaleTimeString('fr-FR')}</p>
         </div>
 
-        {/* Add new entry form */}
-        {isAdmin && (
-          <div className="time-entry-form">
-            <h4>Ajouter un pointage manuel</h4>
-            <form onSubmit={handleAddEntry}>
-              <div className="form-group">
-                <label>Date:</label>
-                <input
-                  type="date"
-                  value={newEntry.date}
-                  onChange={(e) => setNewEntry({...newEntry, date: e.target.value})}
-                  required
-                />
-              </div>
-              <div className="form-group">
-                <label>Heure d'entrée:</label>
-                <input
-                  type="time"
-                  value={newEntry.start_time}
-                  onChange={(e) => setNewEntry({...newEntry, start_time: e.target.value})}
-                  required
-                />
-              </div>
-              <div className="form-group">
-                <label>Heure de sortie:</label>
-                <input
-                  type="time"
-                  value={newEntry.end_time}
-                  onChange={(e) => setNewEntry({...newEntry, end_time: e.target.value})}
-                  required
-                />
-              </div>
-              <button type="submit" className="btn btn-primary">Ajouter le pointage</button>
-            </form>
-          </div>
-        )}
+        { (isAdmin && editingEntry) ? 
+          (
+            <div className="time-entry-form">
+              <h4>Modifier le pointage du {formatDate(editingEntry.date)}</h4>
+              <form onSubmit={handleUpdateEntry}>
+                <div className="form-group">
+                  <label htmlFor="edit-start-time">Heure d'entrée :</label>
+                  <input
+                    id="edit-start-time"
+                    type="time"
+                    value={editForm.start_time}
+                    onChange={(e) => setEditForm({ ...editForm, start_time: e.target.value })}
+                    required
+                  />
+                </div>
+                <div className="form-group">
+                  <label htmlFor="edit-end-time">Heure de sortie :</label>
+                  <input
+                    id="edit-end-time"
+                    type="time"
+                    value={editForm.end_time}
+                    onChange={(e) => setEditForm({ ...editForm, end_time: e.target.value })}
+                    required
+                  />
+                </div>
+                <div className="btn-group">
+                  <button type="submit" className="btn btn-primary">Enregistrer</button>
+                  <button type="button" className="btn btn-secondary" onClick={() => setEditingEntry(null)}>
+                    Annuler
+                  </button>
+                </div>
+              </form>
+            </div>
+          )
+          :
+          (
+            <div>
+              {isAdmin && 
+                (
+                  <div className="time-entry-form">
+                    <h4>Ajouter un pointage manuel</h4>
+                    <form onSubmit={handleAddEntry}>
+                      <div className="form-group">
+                        <label>Date:</label>
+                        <input
+                          type="date"
+                          value={newEntry.date}
+                          onChange={(e) => setNewEntry({...newEntry, date: e.target.value})}
+                          required
+                        />
+                      </div>
+                      <div className="form-group">
+                        <label>Heure d'entrée:</label>
+                        <input
+                          type="time"
+                          value={newEntry.start_time}
+                          onChange={(e) => setNewEntry({...newEntry, start_time: e.target.value})}
+                          required
+                        />
+                      </div>
+                      <div className="form-group">
+                        <label>Heure de sortie:</label>
+                        <input
+                          type="time"
+                          value={newEntry.end_time}
+                          onChange={(e) => setNewEntry({...newEntry, end_time: e.target.value})}
+                          required
+                        />
+                      </div>
+                      <button type="submit" className="btn btn-primary">Ajouter le pointage</button>
+                    </form>
+                  </div>
+                )
+              }
+            </div>
+          )
+        }
 
         {/* Time entries list */}
         <div className="time-entries-list">