diff --git a/server.py b/server.py
index 16165aa..4eb127a 100644
--- a/server.py
+++ b/server.py
@@ -175,6 +175,15 @@ def admin():
     # Get all files for management
     all_files = MediaFile.query.filter_by(is_active=True).order_by(MediaFile.upload_date.desc()).all()
     
+    # Get all users
+    all_users = User.query.order_by(User.username).all()
+    
+    # Get all players
+    all_players = Player.query.order_by(Player.device_id).all()
+    
+    # Get all channels for player assignment
+    all_channels = StreamingChannel.query.filter_by(is_active=True).order_by(StreamingChannel.name).all()
+    
     return render_template('admin.html', 
                          total_files=total_files,
                          total_users=total_users, 
@@ -182,7 +191,10 @@ def admin():
                          total_channels=total_channels,
                          recent_activity=recent_activity,
                          recent_files=recent_files,
-                         all_files=all_files)
+                         all_files=all_files,
+                         all_users=all_users,
+                         all_players=all_players,
+                         all_channels=all_channels)
 
 @app.route('/user')
 @login_required
@@ -304,6 +316,135 @@ def add_channel():
     
     return redirect(url_for('view_channels'))
 
+# User Management Routes
+@app.route('/add_user', methods=['POST'])
+@login_required
+def add_user():
+    if current_user.role != 'admin':
+        flash('Access denied. Admin privileges required.', 'error')
+        return redirect(request.referrer)
+    
+    try:
+        # Check if username already exists
+        existing_user = User.query.filter_by(username=request.form['username']).first()
+        if existing_user:
+            flash('Username already exists.', 'error')
+            return redirect(request.referrer)
+        
+        # Check if email already exists
+        existing_email = User.query.filter_by(email=request.form['email']).first()
+        if existing_email:
+            flash('Email already exists.', 'error')
+            return redirect(request.referrer)
+        
+        user = User(
+            username=request.form['username'],
+            email=request.form['email'],
+            role=request.form.get('role', 'user')
+        )
+        user.set_password(request.form['password'])
+        
+        db.session.add(user)
+        db.session.commit()
+        
+        log_activity('User created', f'Created user: {user.username} ({user.role})')
+        flash(f'User "{user.username}" created successfully!', 'success')
+    except Exception as e:
+        flash(f'Error creating user: {str(e)}', 'error')
+    
+    return redirect(url_for('admin'))
+
+@app.route('/delete_user/<int:user_id>')
+@login_required
+def delete_user(user_id):
+    if current_user.role != 'admin':
+        flash('Access denied. Admin privileges required.', 'error')
+        return redirect(request.referrer)
+    
+    user = User.query.get_or_404(user_id)
+    
+    # Prevent deleting yourself
+    if user.id == current_user.id:
+        flash('You cannot delete your own account.', 'error')
+        return redirect(request.referrer)
+    
+    # Prevent deleting the only admin
+    if user.role == 'admin' and User.query.filter_by(role='admin').count() <= 1:
+        flash('Cannot delete the only admin user.', 'error')
+        return redirect(request.referrer)
+    
+    username = user.username
+    db.session.delete(user)
+    db.session.commit()
+    
+    log_activity('User deleted', f'Deleted user: {username}')
+    flash(f'User "{username}" deleted successfully!', 'success')
+    return redirect(url_for('admin'))
+
+# Player Management Routes
+@app.route('/add_player', methods=['POST'])
+@login_required
+def add_player():
+    try:
+        # Check if device_id already exists
+        existing_player = Player.query.filter_by(device_id=request.form['device_id']).first()
+        if existing_player:
+            flash('Device ID already exists.', 'error')
+            return redirect(request.referrer)
+        
+        player = Player(
+            device_id=request.form['device_id'],
+            name=request.form.get('name', ''),
+            channel_id=int(request.form['channel_id']) if request.form.get('channel_id') else None
+        )
+        
+        db.session.add(player)
+        db.session.commit()
+        
+        log_activity('Player added', f'Added player: {player.device_id}')
+        flash(f'Player "{player.device_id}" added successfully!', 'success')
+    except Exception as e:
+        flash(f'Error adding player: {str(e)}', 'error')
+    
+    return redirect(url_for('admin'))
+
+@app.route('/delete_player/<int:player_id>')
+@login_required
+def delete_player(player_id):
+    if current_user.role != 'admin':
+        flash('Access denied. Admin privileges required.', 'error')
+        return redirect(request.referrer)
+    
+    player = Player.query.get_or_404(player_id)
+    device_id = player.device_id
+    
+    db.session.delete(player)
+    db.session.commit()
+    
+    log_activity('Player deleted', f'Deleted player: {device_id}')
+    flash(f'Player "{device_id}" deleted successfully!', 'success')
+    return redirect(url_for('admin'))
+
+@app.route('/assign_player_channel/<int:player_id>', methods=['POST'])
+@login_required
+def assign_player_channel(player_id):
+    try:
+        player = Player.query.get_or_404(player_id)
+        channel_id = int(request.form['channel_id']) if request.form.get('channel_id') else None
+        
+        old_channel = player.channel.name if player.channel else 'None'
+        player.channel_id = channel_id
+        new_channel = StreamingChannel.query.get(channel_id).name if channel_id else 'None'
+        
+        db.session.commit()
+        
+        log_activity('Player channel assigned', f'Player {player.device_id}: {old_channel} → {new_channel}')
+        flash(f'Player "{player.device_id}" assigned to channel successfully!', 'success')
+    except Exception as e:
+        flash(f'Error assigning player: {str(e)}', 'error')
+    
+    return redirect(request.referrer)
+
 # API Routes
 @app.route('/api/content')
 def api_content():
diff --git a/templates/admin.html b/templates/admin.html
index 9da0ca5..4cb6bd1 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -201,18 +201,23 @@
                         <h5 class="mb-0"><i class="bi bi-display"></i> Players Management</h5>
                     </div>
                     <div class="card-body">
-                        <form method="post" action="/admin/add_player" class="mb-3">
+                        <form method="post" action="{{ url_for('add_player') }}" class="mb-3">
                             <div class="row g-2">
-                                <div class="col-md-4">
-                                    <input type="text" class="form-control" name="name" placeholder="Player Name" required>
+                                <div class="col-md-3">
+                                    <input type="text" class="form-control" name="name" placeholder="Player Name">
                                 </div>
-                                <div class="col-md-4">
+                                <div class="col-md-3">
                                     <input type="text" class="form-control" name="device_id" placeholder="Device ID" required>
                                 </div>
-                                <div class="col-md-4">
-                                    <input type="text" class="form-control" name="location" placeholder="Location">
+                                <div class="col-md-3">
+                                    <select class="form-control" name="channel_id">
+                                        <option value="">No Channel</option>
+                                        {% for channel in all_channels %}
+                                        <option value="{{ channel.id }}">{{ channel.name }}</option>
+                                        {% endfor %}
+                                    </select>
                                 </div>
-                                <div class="col-12">
+                                <div class="col-md-3">
                                     <button type="submit" class="btn btn-success btn-sm">
                                         <i class="bi bi-plus-circle"></i> Add Player
                                     </button>
@@ -226,16 +231,17 @@
                                     <tr>
                                         <th>Name</th>
                                         <th>Device ID</th>
-                                        <th>Location</th>
+                                        <th>Channel</th>
                                         <th>Status</th>
+                                        <th>Actions</th>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    {% for player in players %}
+                                    {% for player in all_players %}
                                     <tr>
-                                        <td>{{ player.name }}</td>
+                                        <td>{{ player.name or player.device_id }}</td>
                                         <td><code>{{ player.device_id }}</code></td>
-                                        <td>{{ player.location or '-' }}</td>
+                                        <td>{{ player.channel.name if player.channel else 'No Channel' }}</td>
                                         <td>
                                             {% if player.is_active %}
                                                 <span class="badge bg-success">Active</span>
@@ -243,6 +249,13 @@
                                                 <span class="badge bg-secondary">Inactive</span>
                                             {% endif %}
                                         </td>
+                                        <td>
+                                            <a href="{{ url_for('delete_player', player_id=player.id) }}" 
+                                               class="btn btn-danger btn-sm" 
+                                               onclick="return confirm('Are you sure you want to delete this player?')">
+                                                <i class="bi bi-trash"></i>
+                                            </a>
+                                        </td>
                                     </tr>
                                     {% endfor %}
                                 </tbody>
@@ -259,23 +272,26 @@
                         <h5 class="mb-0"><i class="bi bi-people"></i> Users Management</h5>
                     </div>
                     <div class="card-body">
-                        <form method="post" action="/admin/add_user" class="mb-3">
+                        <form method="post" action="{{ url_for('add_user') }}" class="mb-3">
                             <div class="row g-2">
-                                <div class="col-md-5">
+                                <div class="col-md-3">
                                     <input type="text" class="form-control" name="username" placeholder="Username" required>
                                 </div>
-                                <div class="col-md-4">
-                                    <input type="password" class="form-control" name="password" placeholder="Password" required>
+                                <div class="col-md-3">
+                                    <input type="email" class="form-control" name="email" placeholder="Email" required>
                                 </div>
                                 <div class="col-md-3">
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" name="is_admin" id="is_admin">
-                                        <label class="form-check-label" for="is_admin">Admin</label>
-                                    </div>
+                                    <input type="password" class="form-control" name="password" placeholder="Password" required>
                                 </div>
-                                <div class="col-12">
+                                <div class="col-md-2">
+                                    <select class="form-control" name="role" required>
+                                        <option value="user">User</option>
+                                        <option value="admin">Admin</option>
+                                    </select>
+                                </div>
+                                <div class="col-md-1">
                                     <button type="submit" class="btn btn-success btn-sm">
-                                        <i class="bi bi-person-plus"></i> Add User
+                                        <i class="bi bi-person-plus"></i> Add
                                     </button>
                                 </div>
                             </div>
@@ -286,20 +302,32 @@
                                 <thead>
                                     <tr>
                                         <th>Username</th>
+                                        <th>Email</th>
                                         <th>Role</th>
+                                        <th>Actions</th>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    {% for user in users %}
+                                    {% for user in all_users %}
                                     <tr>
                                         <td>{{ user.username }}</td>
+                                        <td>{{ user.email }}</td>
                                         <td>
-                                            {% if user.is_admin %}
+                                            {% if user.role == 'admin' %}
                                                 <span class="badge bg-warning">Admin</span>
                                             {% else %}
                                                 <span class="badge bg-primary">User</span>
                                             {% endif %}
                                         </td>
+                                        <td>
+                                            {% if user.id != current_user.id %}
+                                            <a href="{{ url_for('delete_user', user_id=user.id) }}" 
+                                               class="btn btn-danger btn-sm" 
+                                               onclick="return confirm('Are you sure you want to delete this user?')">
+                                                <i class="bi bi-trash"></i>
+                                            </a>
+                                            {% endif %}
+                                        </td>
                                     </tr>
                                     {% endfor %}
                                 </tbody>